incorporate reviewer suggestions, clean up UFS-DA var and ens config …

…files, correct errors in config.atmensanl, remove unnecessary line in analysis.py (#1313)
NOAA-EMC · Mar 3, 2023 · 96b89d8 · 96b89d8
1 parent 1f1e0cc
commit 96b89d8
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 43 deletions.
diff --git a/parm/config/config.atmanl b/parm/config/config.atmanl
@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 ########## config.atmanl ##########
-# configuration common to all atm analysis tasks
+# configuration common to all atm var analysis tasks
 
 echo "BEGIN: config.atmanl"
 
@@ -11,12 +11,6 @@ export ATMVARYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/variational/3dvar_dripcg.yaml
 export STATICB_TYPE="identity"
 export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/staticb_${STATICB_TYPE}.yaml
 export FV3JEDI_FIX=${HOMEgfs}/fix/gdas
-export R2D2_OBS_DB='ufsda_test'
-export R2D2_OBS_DUMP='oper_gdas'
-export R2D2_OBS_SRC='ncdiag'
-export R2D2_BC_SRC='gsi'
-export R2D2_BC_DUMP='oper_gdas'
-export R2D2_ARCH_DB='local'
 export INTERP_METHOD='barycentric'
 
 export layout_x=1

diff --git a/parm/config/config.atmanlfinal b/parm/config/config.atmanlfinal
@@ -1,10 +1,10 @@
 #!/bin/bash -x
 
 ########## config.atmanlfinal ##########
-# Post Atm Analysis specific
+# Post Atm Var Analysis specific
 
 echo "BEGIN: config.atmanlfinal"
 
 # Get task specific resources
-. "${EXPDIR}"/config.resources atmanlfinal
+. "${EXPDIR}/config.resources" atmanlfinal
 echo "END: config.atmanlfinal"
diff --git a/parm/config/config.atmanlinit b/parm/config/config.atmanlinit
@@ -1,10 +1,10 @@
 #!/bin/bash -x
 
 ########## config.atmanlinit ##########
-# Pre Atm Analysis specific
+# Pre Atm Var Analysis specific
 
 echo "BEGIN: config.atmanlinit"
 
 # Get task specific resources
-. "${EXPDIR}"/config.resources atmanlinit
+. "${EXPDIR}/config.resources" atmanlinit
 echo "END: config.atmanlinit"
diff --git a/parm/config/config.atmanlrun b/parm/config/config.atmanlrun
@@ -1,11 +1,11 @@
 #!/bin/bash -x
 
 ########## config.atmanlrun ##########
-# Atmsol Analysis specific
+# Atm Var Analysis specific
 
 echo "BEGIN: config.atmanlrun"
 
 # Get task specific resources
-. "${EXPDIR}"/config.resources atmanlrun
+. "${EXPDIR}/config.resources" atmanlrun
 
 echo "END: config.atmanlrun"
diff --git a/parm/config/config.atmensanl b/parm/config/config.atmensanl
@@ -1,22 +1,14 @@
 #!/bin/bash -x
 
 ########## config.atmensanl ##########
-# configuration common to all atm analysis tasks
+# configuration common to all atm ens analysis tasks
 
 echo "BEGIN: config.atmensanl"
 
 export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/config/
-export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/lists/gdas_prototype.yaml
-export ATMVARYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/variational/3dvar_dripcg.yaml
-export STATICB_TYPE="identity"
-export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/staticb_${STATICB_TYPE}.yaml
+export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/lists/lgetkf_prototype.yaml
+export ATMENSYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/lgetkf/lgetkf.yaml
 export FV3JEDI_FIX=${HOMEgfs}/fix/gdas
-export R2D2_OBS_DB='ufsda_test'
-export R2D2_OBS_DUMP='oper_gdas'
-export R2D2_OBS_SRC='ncdiag'
-export R2D2_BC_SRC='gsi'
-export R2D2_BC_DUMP='oper_gdas'
-export R2D2_ARCH_DB='local'
 export INTERP_METHOD='barycentric'
 
 export layout_x=1
@@ -25,7 +17,7 @@ export layout_y=1
 export io_layout_x=1
 export io_layout_y=1
 
-export JEDIVAREXE=${HOMEgfs}/exec/fv3jedi_var.x
+export JEDIENSEXE=${HOMEgfs}/exec/fv3jedi_letkf.x
 export crtm_VERSION="2.3.0"
 
 echo "END: config.atmensanl"
diff --git a/parm/config/config.atmensanlfinal b/parm/config/config.atmensanlfinal
@@ -1,10 +1,10 @@
 #!/bin/bash -x
 
-########## config.atmanlfinal ##########
-# Post Atm Analysis specific
+########## config.atmensanlfinal ##########
+# Post Atm Ens Analysis specific
 
-echo "BEGIN: config.atmanlfinal"
+echo "BEGIN: config.atmensanlfinal"
 
 # Get task specific resources
-. "${EXPDIR}"/config.resources atmanlfinal
-echo "END: config.atmanlfinal"
+. "${EXPDIR}/config.resources" atmensanlfinal
+echo "END: config.atmensanlfinal"
diff --git a/parm/config/config.atmensanlinit b/parm/config/config.atmensanlinit
@@ -1,10 +1,10 @@
 #!/bin/bash -x
 
-########## config.atmanlinit ##########
-# Pre Atm Analysis specific
+########## config.atmensanlinit ##########
+# Pre Atm Ens Analysis specific
 
-echo "BEGIN: config.atmanlinit"
+echo "BEGIN: config.atmensanlinit"
 
 # Get task specific resources
-. "${EXPDIR}"/config.resources atmanlinit
-echo "END: config.atmanlinit"
+. "${EXPDIR}/config.resources" atmensanlinit
+echo "END: config.atmensanlinit"
diff --git a/parm/config/config.atmensanlrun b/parm/config/config.atmensanlrun
@@ -1,11 +1,11 @@
 #!/bin/bash -x
 
-########## config.atmanlrun ##########
-# Atmsol Analysis specific
+########## config.atmensanlrun ##########
+# Atm Ens Analysis specific
 
-echo "BEGIN: config.atmanlrun"
+echo "BEGIN: config.atmensanlrun"
 
 # Get task specific resources
-. "${EXPDIR}"/config.resources atmanlrun
+. "${EXPDIR}/config.resources" atmensanlrun
 
-echo "END: config.atmanlrun"
+echo "END: config.atmensanlrun"
diff --git a/ush/python/pygfs/task/analysis.py b/ush/python/pygfs/task/analysis.py
@@ -59,7 +59,6 @@ def get_obs_dict(self: Task) -> Dict[str, Any]:
         copylist = []
         for ob in observers:
             obfile = ob['obs space']['obsdatain']['engine']['obsfile']
-            obfile = obfile.replace('enkf', '')
             basename = os.path.basename(obfile)
             copylist.append([os.path.join(self.config['COMIN_OBS'], basename), obfile])
         obs_dict = {

diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py
@@ -407,8 +407,10 @@ def atmanlinit(self):
         else:
             dependencies = rocoto.create_dependency(dep=deps)
 
+        cycledef = "gdas"
         resources = self.get_resource('atmanlinit')
-        task = create_wf_task('atmanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+        task = create_wf_task('atmanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies,
+                              cycledef=cycledef)
 
         return task
 
@@ -1093,8 +1095,10 @@ def atmensanlinit(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
 
+        cycledef = "gdas"
         resources = self.get_resource('atmensanlinit')
-        task = create_wf_task('atmensanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies)
+        task = create_wf_task('atmensanlinit', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies,
+                              cycledef=cycledef)
 
         return task