diff --git a/src/offline/cable_driver.F90 b/src/offline/cable_driver.F90 index 25e1c0cd6..3a2dde034 100644 --- a/src/offline/cable_driver.F90 +++ b/src/offline/cable_driver.F90 @@ -73,8 +73,7 @@ PROGRAM cable_offline_driver IS_LEAPYEAR, calcsoilalbedo, & kwidth_gl, gw_params - USE cable_namelist_util, ONLY : get_namelist_file_name,& - CABLE_NAMELIST,arg_not_namelist + USE cable_namelist_util, ONLY : CABLE_NAMELIST, arg_not_namelist ! physical constants USE cable_phys_constants_mod, ONLY : CTFRZ => TFRZ USE cable_phys_constants_mod, ONLY : CEMLEAF => EMLEAF @@ -311,10 +310,6 @@ PROGRAM cable_offline_driver CALL cable_driver_init() cable_runtime%offline = .TRUE. - !check to see if first argument passed to cable is - !the name of the namelist file - !if not use cable.nml - CALL get_namelist_file_name() WRITE(*,*) "THE NAME LIST IS ",CABLE_NAMELIST ! Open, read and close the namelist file. diff --git a/src/offline/cable_driver_init.F90 b/src/offline/cable_driver_init.F90 index 525b5d4bf..9a018e07c 100644 --- a/src/offline/cable_driver_init.F90 +++ b/src/offline/cable_driver_init.F90 @@ -1,5 +1,6 @@ MODULE cable_driver_init_mod !! Module containing routines for CABLE offline driver initialisation + USE cable_namelist_util, ONLY : get_namelist_file_name IMPLICIT NONE PRIVATE @@ -10,6 +11,11 @@ MODULE cable_driver_init_mod SUBROUTINE cable_driver_init() !! Model initialisation routine for the CABLE offline driver. + !check to see if first argument passed to cable is + !the name of the namelist file + !if not use cable.nml + CALL get_namelist_file_name() + #ifdef __MPI__ ! MPI specific initialisation #else diff --git a/src/offline/cable_mpidrv.F90 b/src/offline/cable_mpidrv.F90 index 52bdb48de..296f2b989 100644 --- a/src/offline/cable_mpidrv.F90 +++ b/src/offline/cable_mpidrv.F90 @@ -25,7 +25,6 @@ PROGRAM mpi_driver USE cable_mpicommon USE cable_mpimaster USE cable_mpiworker - USE cable_namelist_util, ONLY: get_namelist_file_name IMPLICIT NONE @@ -38,11 +37,6 @@ PROGRAM mpi_driver CALL MPI_Comm_dup (MPI_COMM_WORLD, comm, ierr) CALL MPI_Comm_size (comm, np, ierr) - !check to see if first argument passed to cable is - !the name of the namelist file - !if not use cable.nml - CALL get_namelist_file_name() - IF (np < 2) THEN WRITE (*,*) 'This program needs at least 2 processes to run!' CALL MPI_Abort (comm, 0, ierr) diff --git a/src/offline/cable_mpimaster.F90 b/src/offline/cable_mpimaster.F90 index c9f75d09b..0f724f3ef 100644 --- a/src/offline/cable_mpimaster.F90 +++ b/src/offline/cable_mpimaster.F90 @@ -204,8 +204,7 @@ SUBROUTINE mpidrv_master (comm) PLUME_MIP_INIT USE CABLE_CRU, ONLY: CRU_TYPE, CRU_GET_SUBDIURNAL_MET, CRU_INIT - USE cable_namelist_util, ONLY : get_namelist_file_name,& - CABLE_NAMELIST + USE cable_namelist_util, ONLY : CABLE_NAMELIST USE landuse_constant, ONLY: mstate,mvmax,mharvw USE landuse_variable diff --git a/src/offline/cable_mpiworker.F90 b/src/offline/cable_mpiworker.F90 index 6c06f0dea..ab51795fd 100644 --- a/src/offline/cable_mpiworker.F90 +++ b/src/offline/cable_mpiworker.F90 @@ -151,9 +151,8 @@ SUBROUTINE mpidrv_worker (comm) ! PLUME-MIP only USE CABLE_PLUME_MIP, ONLY: PLUME_MIP_TYPE - USE cable_namelist_util, ONLY : get_namelist_file_name,& - CABLE_NAMELIST - + USE cable_namelist_util, ONLY : CABLE_NAMELIST + USE cbl_soil_snow_init_special_module IMPLICIT NONE