Skip to content

Commit 07c86f8

Browse files
committed
additional changes to mwrtm_path and nml_input_path for coupled land-atm DAS (ldas_setup)
1 parent 26c4b55 commit 07c86f8

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

GEOSldas_App/ldas_setup

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ class LDASsetup:
240240
self.rqdExeInp['RESTART_DOMAIN'] = _agcm_res +'x6C_GLOBAL'
241241

242242
# the following are not in default rqdExeInp list; hardwire for now
243-
self.rqdExeInp['MWRTM_PATH'] = '/discover/nobackup/projects/gmao/smap/SMAP_Nature/bcs/RTM_params/RTMParam_L2DCA_R19/'
243+
self.rqdExeInp['MWRTM_PATH'] = '/discover/nobackup/projects/gmao/smap/LDAS_inputs_for_LADAS/RTM_params/RTMParam_SMAP_L4SM_v006/'
244244
self.rqdExeInp['LAND_ASSIM'] = "YES"
245245
self.rqdExeInp['MET_HINTERP'] = 0
246246
self.landassim_dt = 10800 # seconds
@@ -274,8 +274,6 @@ class LDASsetup:
274274
shutil.copy(_etcdir+'/LDASsa_SPECIAL_inputs_ensupd.nml' , _rundir)
275275
# edit resolution info in ensupd nml file
276276
sp.run(['sed', '-i', 's/<CFnnnn>/'+_agcm_res+'/g', _rundir+'/LDASsa_SPECIAL_inputs_ensupd.nml'])
277-
self.rqdExeInp['NML_INPUT_PATH'] = _rundir
278-
279277

280278
# end if self.ladas_cpl > 0 --------------------------------------------------------------------
281279

@@ -1252,15 +1250,13 @@ class LDASsetup:
12521250
shortfile=self.rundir+'/'+nmlfile.split('/')[-1]
12531251
shutil.copy2(nmlfile, shortfile)
12541252
# special nml
1255-
special_nml=[]
1256-
if 'NML_INPUT_PATH' in self.rqdExeInp :
1257-
special_nml = glob.glob(self.rqdExeInp['NML_INPUT_PATH']+'/LDASsa_SPECIAL_inputs_*.nml')
1258-
if self.ladas_cpl > 0:
1259-
special_nml = glob.glob(self.rqdExeInp['NML_INPUT_PATH']+'/'+ self.rqdExeInp['EXP_DOMAIN'] + '/LDASsa_SPECIAL_inputs_*.nml')
1260-
1261-
for nmlfile in special_nml:
1262-
shortfile=nmlfile.split('/')[-1]
1263-
shutil.copy2(nmlfile, self.rundir+'/'+shortfile)
1253+
if self.ladas_cpl == 0:
1254+
special_nml=[]
1255+
if 'NML_INPUT_PATH' in self.rqdExeInp :
1256+
special_nml = glob.glob(self.rqdExeInp['NML_INPUT_PATH']+'/LDASsa_SPECIAL_inputs_*.nml')
1257+
for nmlfile in special_nml:
1258+
shortfile=nmlfile.split('/')[-1]
1259+
shutil.copy2(nmlfile, self.rundir+'/'+shortfile)
12641260

12651261
# get optimzed NX and IMS
12661262
optimized_distribution_file = tempfile.NamedTemporaryFile(delete=False)

0 commit comments

Comments
 (0)