rename dart_rundir

dartwrf/assim_synth_obs.py

@@ -170,7 +170,7 @@ def archive_filteroutput(time):
         for ftype in ftypes:
             for iens in range(1, exp.n_ens + 1):
                 fname = "/"+ftype+"_member_" + str(iens).zfill(4) + ".nc"
-                copy(cluster.dartrundir + fname, archive_assim + fname)
+                copy(cluster.dart_rundir + fname, archive_assim + fname)
 
         for f in ["output_mean.nc", "output_sd.nc"]:  # copy mean and sd to archive
             copy(cluster.dart_rundir + "/" + f, archive_assim + "/" + f)
@@ -226,7 +226,7 @@ def set_obserr_assimilate_in_obsseqout(oso, outfile="./obs_seq.out"):
         where_oso_iskind = oso.df.kind == kind
         
         if obscfg["error_assimilate"] == False:
-            osf_prior = obsseq.ObsSeq(cluster.dartrundir + "/obs_seq.final")  # this file will be generated by `evaluate()`
+            osf_prior = obsseq.ObsSeq(cluster.dart_rundir + "/obs_seq.final")  # this file will be generated by `evaluate()`
             
             where_osf_iskind = osf_prior.df.kind == kind
 
@@ -240,7 +240,7 @@ def set_obserr_assimilate_in_obsseqout(oso, outfile="./obs_seq.out"):
     oso.to_dart(outfile)
 
 def qc_obs(time, oso):
-    osf_prior = obsseq.ObsSeq(cluster.dartrundir + "/obs_seq.final")
+    osf_prior = obsseq.ObsSeq(cluster.dart_rundir + "/obs_seq.final")
 
     # obs should be superobbed already!
     for i, obscfg in enumerate(exp.observations): 
@@ -555,7 +555,7 @@ def main(time, prior_init_time, prior_valid_time, prior_path_exp):
         evaluate(time, output_format="%Y-%m-%d_%H:%M_obs_seq.final-eval_prior_allobs")
 
     print(" assign observation-errors for assimilation ")
-    set_obserr_assimilate_in_obsseqout(oso, outfile=cluster.dartrundir + "/obs_seq.out")
+    set_obserr_assimilate_in_obsseqout(oso, outfile=cluster.dart_rundir + "/obs_seq.out")
 
     if do_QC:
         print(" 2.3) reject observations? ")

tests/test_dart-rttov.py

@@ -35,7 +35,7 @@ else:
     datadir = '/jetfs/home/lkugler/data/sim_archive/'
     img_dir = '/jetfs/home/lkugler/analysis_plots/'
 
-dartrundir = datadir+'/../run_DART/test_jet'
+dart_rundir = datadir+'/../run_DART/test_jet'
 
 def test_rttov():
 
@@ -59,9 +59,9 @@ def test_rttov():
 
 
             shutil.copy(datadir+'/'+case+'/2008-07-30_12:00/1/'+time.strftime('wrfout_d01_2008-07-30_%H:%M:00'), 
-                        dartrundir + "/wrfout_d01")
+                        dart_rundir + "/wrfout_d01")
 
-            wrfout_add_geo.run(datadir+ "/geo_em.d01.nc", dartrundir + "/wrfout_d01")
+            wrfout_add_geo.run(datadir+ "/geo_em.d01.nc", dart_rundir + "/wrfout_d01")
            
 
             osq.create_obsseqin_alltypes(time, [obscfg])
@@ -69,7 +69,7 @@ def test_rttov():
             aso.run_perfect_model_obs(nproc=1) 
 
 
-            obs = obsseq.ObsSeq(dartrundir+'/obs_seq.out')
+            obs = obsseq.ObsSeq(dart_rundir+'/obs_seq.out')
             obs_map = obs.df.truth.values.reshape(150,150)