GitHub Issue #392. Added $COMPONENT to both $DMPDIR/$CDUMP.$PDY/$cyc …

…and $DMPDIR/$CDUMP.$gPDY/$gcyc for: * jobs/JGDAS_ATMOS_ANALYSIS_DIAG * jobs/JGDAS_ATMOS_CHGRES_FORENKF * jobs/JGDAS_ENKF_DIAG * jobs/JGDAS_ENKF_ECEN * jobs/JGDAS_ENKF_SELECT_OBS * jobs/JGDAS_ENKF_SFC * jobs/JGLOBAL_ATMOS_ANALYSIS * jobs/JGLOBAL_ATMOS_ANALYSIS_CALC * ush/calcanl_gfs.py - patch to make the chgres_inc.x exec run sequentially instead of at the same time.
NOAA-EMC · May 27, 2022 · b1b4ca9 · b1b4ca9
1 parent a90b632
commit b1b4ca9
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 25 deletions.
diff --git a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG
@@ -85,8 +85,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script

diff --git a/jobs/JGDAS_ATMOS_CHGRES_FORENKF b/jobs/JGDAS_ATMOS_CHGRES_FORENKF
@@ -87,8 +87,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
     export COMOUT_ENS="$ROTDIR/enkfgdas.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script

diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGDAS_ENKF_DIAG
@@ -82,8 +82,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN_GES, COMIN_ANL COMIN_GES_ENS, and COMOUT  are used in script

diff --git a/jobs/JGDAS_ENKF_ECEN b/jobs/JGDAS_ENKF_ECEN
@@ -90,8 +90,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in script

diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS
@@ -82,8 +82,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN_GES, COMIN_ANL COMIN_GES_ENS, and COMOUT  are used in script

diff --git a/jobs/JGDAS_ENKF_SFC b/jobs/JGDAS_ENKF_SFC
@@ -90,8 +90,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$RUN.$PDY/$cyc/$COMPONENT}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in script

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS
@@ -85,8 +85,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
@@ -85,8 +85,8 @@ if [ $RUN_ENVIR = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/$GDUMP.$gPDY/$gcyc/$COMPONENT}
 else
     export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
-    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc"
-    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc"
+    export COMIN_OBS="$DMPDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+    export COMIN_GES_OBS="$DMPDIR/$GDUMP.$gPDY/$gcyc/$COMPONENT"
 fi
 mkdir -m 775 -p $COMOUT
 # COMIN_GES and COMIN_GES_ENS are used in script

diff --git a/ush/calcanl_gfs.py b/ush/calcanl_gfs.py
@@ -225,7 +225,6 @@ def calcanl_gfs(DoIAU, l4DEnsVar, Write4Danl, ComOut, APrefix, ASuffix,
         sys.exit(1)
 
     ####### generate the full resolution analysis
-    interp_jobs = []
     ihost = 0
     ### interpolate increment to full background resolution
     for fh in IAUHH:
@@ -261,18 +260,17 @@ def calcanl_gfs(DoIAU, l4DEnsVar, Write4Danl, ComOut, APrefix, ASuffix,
                 os.environ['SLURM_HOSTFILE'] = CalcAnlDir+'/hosts'
             print('interp_inc', fh, namelist)
             job = subprocess.Popen(ExecCMDMPI10_host+' '+CalcAnlDir+'/chgres_inc.x', shell=True, cwd=CalcAnlDir)
-            interp_jobs.append(job)
             print(ExecCMDMPI10_host+' '+CalcAnlDir+'/chgres_inc.x submitted on '+hosts[ihost])
+            sys.stdout.flush()
+            ec = job.wait()
+            if ec != 0:
+                print('Error with chgres_inc.x at forecast hour: f'+format(fh, '03'))
+                print('Error with chgres_inc.x, exit code='+str(ec))
+                print(locals())
+                sys.exit(ec)
             ihost+=1
         else:
             print('f'+format(fh, '03')+' is in $IAUFHRS but increment file is missing. Skipping.')
-    sys.stdout.flush()
-    exit_codes = [p.wait() for p in interp_jobs]
-    for ec in exit_codes:
-        if ec != 0:
-            print('Error with chgres_inc.x, exit code='+str(ec))
-            print(locals())
-            sys.exit(ec)
 
     #### generate analysis from interpolated increment
     CalcAnlDir6 = RunDir+'/calcanl_'+format(6, '02')