dev: add a/eCO2 transient run compatibility to ensemble

XiaomanLu · Apr 21, 2022 · a9ac364 · a9ac364
1 parent 263e284
commit a9ac364
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 scripts/
 temp/
 plots/
+UQ_output/
 srcmods*
 run_logs_archive/
 

diff --git a/ensemble_copy.py b/ensemble_copy.py
@@ -152,18 +152,25 @@
                       finidat_file_orig = orig_dir+'/'+finidat_file_orig[2:]
                    #get finidat files from previous ensemble cases if available
                    if (('1850' in casename or 'CROP' in casename) and not ('ad_spinup' in casename) and not \
-                          ('trans' in casename)): 
+                          ('trans' in casename or '20TR' in casename)): 
                       finidat_file_path = os.path.abspath(options.runroot)+'/UQ/'+casename.replace('1850CNP','1850CN')+'_ad_spinup/g'+gst[1:]
                       if (os.path.exists(finidat_file_path)):
                             finidat_file_orig = finidat_file_path+'/*.'+options.model_name+'.r.*.nc'
                             os.system('python adjust_restart.py --rundir '+finidat_file_path+' --casename '+ \
                                 casename.replace('1850CNP','1850CN')+'_ad_spinup')
                    if ('20TR' in casename):
-                      finidat_file_path = os.path.abspath(options.runroot)+'/UQ/'+casename.replace('20TR','1850')+ \
-                                       '/g'+gst[1:]
-                      if (os.path.exists(finidat_file_path)):
-                          finidat_file_orig = finidat_file_path+'/*.'+options.model_name+'.r.*.nc'
-                          os.system('rm '+finidat_file_path+'/*ad_spinup*.'+options.model_name+'.r.*.nc')
+                      if ( not ('CO2' in casename)):
+                          finidat_file_path = os.path.abspath(options.runroot)+'/UQ/'+casename.replace('20TR','1850')+ \
+                                          '/g'+gst[1:]
+                          if (os.path.exists(finidat_file_path)):
+                              finidat_file_orig = finidat_file_path+'/*.'+options.model_name+'.r.*.nc'
+                              os.system('rm '+finidat_file_path+'/*ad_spinup*.'+options.model_name+'.r.*.nc')
+                      else: 
+                          finidat_file_path = os.path.abspath(options.runroot)+'/UQ/'+casename[:-5]+ \
+                                          '/g'+gst[1:]
+                          if (os.path.exists(finidat_file_path)):
+                              finidat_file_orig = finidat_file_path+'/*.'+options.model_name+'.r.*.nc'
+                              os.system('rm '+finidat_file_path+'/*1850*.'+options.model_name+'.r.*.nc')
                    if ('trans' in casename):
                       finidat_file_path = os.path.abspath(options.runroot)+'/UQ/'+casename.replace('_trans','')+ \
                                        '/g'+gst[1:]

diff --git a/ensemble_run.py b/ensemble_run.py
@@ -206,7 +206,7 @@ def putvar(fname, varname, varvals):
 
     isfirstcase=False
 
-#---------  code to post-process ensebmle member and cacluate total normalized SSE ----------
+#---------  code to post-process ensemble member and cacluate total normalized SSE ----------
 sse=0
 myoutput = open('myoutput_sse.txt','w')
 myind = 0

diff --git a/site_fullrun.py b/site_fullrun.py
@@ -1321,6 +1321,10 @@ def submit(fname, submit_type='qsub', job_depend=''):
                 else:
                   cases.append(basecase+'_'+modelst.replace('1850','20TR'))
 
+                if (options.eco2_file):
+                  cases.append(basecase+'_'+modelst.replace('1850','20TR')+'_aCO2')
+                  cases.append(basecase+'_'+modelst.replace('1850','20TR')+'_eCO2')
+
             job_depend_run=''    
             if (len(cases) > 1 and options.constraints != ''):
               cases=[]    #QPSO will run all cases