hardwired changes to analysis_calc

guoqing-noaa · Jul 27, 2024 · 3a86d82 · 3a86d82
1 parent c7d3592
commit 3a86d82
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
@@ -37,7 +37,8 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
     COM_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
 
 
-export ATMGES="${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc"
+#export ATMGES="${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc"
+export ATMGES="${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf001.nc"
 if [ ! -f ${ATMGES} ]; then
     echo "FATAL ERROR: FILE MISSING: ATMGES = ${ATMGES}"
     exit 1

diff --git a/scripts/exglobal_atmos_analysis_calc.sh b/scripts/exglobal_atmos_analysis_calc.sh
@@ -72,7 +72,7 @@ GPREFIX=${GPREFIX:-""}
 ATMG03=${ATMG03:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf003.nc}
 ATMG04=${ATMG04:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf004.nc}
 ATMG05=${ATMG05:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf005.nc}
-ATMGES=${ATMGES:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc}
+ATMGES=${ATMGES:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf001.nc}
 ATMG07=${ATMG07:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf007.nc}
 ATMG08=${ATMG08:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf008.nc}
 ATMG09=${ATMG09:-${COM_ATMOS_HISTORY_PREV}/${GPREFIX}atmf009.nc}

diff --git a/ush/calcanl_gfs.py b/ush/calcanl_gfs.py
@@ -33,9 +33,9 @@ def calcanl_gfs(DoIAU, l4DEnsVar, Write4Danl, ComOut, APrefix,
                 if not os.path.exists(CalcAnlDir):
                     gsi_utils.make_dir(CalcAnlDir)
                 gsi_utils.copy_file(ExecAnl, CalcAnlDir + '/calc_anl.x')
-                gsi_utils.link_file(RunDir + '/siginc.nc', CalcAnlDir + '/siginc.nc.06')
-                gsi_utils.link_file(RunDir + '/sigf06', CalcAnlDir + '/ges.06')
-                gsi_utils.link_file(RunDir + '/siganl', CalcAnlDir + '/anl.06')
+                gsi_utils.link_file(RunDir + '/siginc.nc', CalcAnlDir + '/siginc.nc.01')
+                gsi_utils.link_file(RunDir + '/sigf06', CalcAnlDir + '/ges.01')
+                gsi_utils.link_file(RunDir + '/siganl', CalcAnlDir + '/anl.01')
                 gsi_utils.copy_file(ExecChgresInc, CalcAnlDir + '/chgres_inc.x')
                 # for ensemble res analysis
                 if Cdump in ["gdas", "gfs"]:
@@ -89,9 +89,9 @@ def calcanl_gfs(DoIAU, l4DEnsVar, Write4Danl, ComOut, APrefix,
         if not os.path.exists(CalcAnlDir):
             gsi_utils.make_dir(CalcAnlDir)
         gsi_utils.copy_file(ExecAnl, CalcAnlDir + '/calc_anl.x')
-        gsi_utils.link_file(RunDir + '/siginc.nc', CalcAnlDir + '/siginc.nc.06')
-        gsi_utils.link_file(RunDir + '/sigf06', CalcAnlDir + '/ges.06')
-        gsi_utils.link_file(RunDir + '/siganl', CalcAnlDir + '/anl.06')
+        gsi_utils.link_file(RunDir + '/siginc.nc', CalcAnlDir + '/siginc.nc.01')
+        gsi_utils.link_file(RunDir + '/sigf06', CalcAnlDir + '/ges.01')
+        gsi_utils.link_file(RunDir + '/siganl', CalcAnlDir + '/anl.01')
         gsi_utils.copy_file(ExecChgresInc, CalcAnlDir + '/chgres_inc.x')
         # for ensemble res analysis
         CalcAnlDir = RunDir + '/calcanl_ensres_' + format(6, '02')
@@ -273,8 +273,8 @@ def calcanl_gfs(DoIAU, l4DEnsVar, Write4Danl, ComOut, APrefix,
     namelist["setup"] = {"datapath": "'./'",
                          "analysis_filename": "'anl'",
                          "firstguess_filename": "'ges'",
-                         "increment_filename": "'inc.fullres'",
-                         "fhr": 6,
+                         "increment_filename": "'siginc.nc'",
+                         "fhr": 1,
                          "jedi": python2fortran_bool[JEDI],
                          }
 
@@ -283,8 +283,8 @@ def calcanl_gfs(DoIAU, l4DEnsVar, Write4Danl, ComOut, APrefix,
     # run the executable
     if ihost >= nhosts - 1:
         ihost = 0
-    if launcher == 'srun':
-        del os.environ['SLURM_HOSTFILE']
+#   if launcher == 'srun':
+#       del os.environ['SLURM_HOSTFILE']
     print('fullres_calc_anl', namelist)
     fullres_anl_job = subprocess.Popen(ExecCMDMPILevs_nohost + ' ' + CalcAnlDir6 + '/calc_anl.x', shell=True, cwd=CalcAnlDir6)
     print(ExecCMDMPILevs_nohost + ' ' + CalcAnlDir6 + '/calc_anl.x submitted')