concising the exgfs_wave_post_pnt.sh and config files, issue NOAA-EMC…

…#3157
AliS-Noaa · Jan 10, 2025 · d2b6b70 · d2b6b70
1 parent 84fc8f3
commit d2b6b70
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/parm/config/config.resources.emc.dyn b/parm/config/config.resources.emc.dyn
@@ -85,23 +85,23 @@ elif [ $step = "wavepostbndpnt" ]; then
     export wtime_wavepostbndpnt="00:30:00"
     export npe_wavepostbndpnt=1
     export nth_wavepostbndpnt=1
-    export npe_node_wavepostbndpnt=1
+    export npe_node_wavepostbndpnt=${npe_wavepostbndpnt}
     export NTASKS=$npe_wavepostbndpnt
 
 elif [ $step = "wavepostbndpntbll" ]; then
 
     export wtime_wavepostbndpntbll="00:10:00"
     export npe_wavepostbndpntbll=2
     export nth_wavepostbndpntbll=1
-    export npe_node_wavepostbndpntbll=2
+    export npe_node_wavepostbndpntbll=${npe_wavepostbndpntbll}
     export NTASKS=$npe_wavepostbndpntbll
 
 elif [ $step = "wavepostpnt" ]; then
 
     export wtime_wavepostpnt="00:35:00"
     export npe_wavepostpnt=3
     export nth_wavepostpnt=1
-    export npe_node_wavepostpnt=3
+    export npe_node_wavepostpnt=${npe_wavepostpnt}
     export NTASKS=$npe_wavepostpnt
 
 elif [ $step = "wavegempak" ]; then

diff --git a/parm/config/config.resources.nco.static b/parm/config/config.resources.nco.static
@@ -69,23 +69,23 @@ elif [ $step = "wavepostbndpnt" ]; then
     export wtime_wavepostbndpnt="00:30:00"
     export npe_wavepostbndpnt=1
     export nth_wavepostbndpnt=1
-    export npe_node_wavepostbndpnt=1
+    export npe_node_wavepostbndpnt=${npe_wavepostbndpnt}
     export NTASKS=$npe_wavepostbndpnt
 
 elif [ $step = "wavepostbndpntbll" ]; then
 
     export wtime_wavepostbndpntbll="00:10:00"
     export npe_wavepostbndpntbll=2
     export nth_wavepostbndpntbll=1
-    export npe_node_wavepostbndpntbll=2
+    export npe_node_wavepostbndpntbll=${npe_wavepostbndpntbll}
     export NTASKS=$npe_wavepostbndpntbll
 
 elif [ $step = "wavepostpnt" ]; then
 
     export wtime_wavepostpnt="00:35:00"
     export npe_wavepostpnt=3
     export nth_wavepostpnt=1
-    export npe_node_wavepostpnt=3
+    export npe_node_wavepostpnt=${npe_wavepostpnt}
     export NTASKS=$npe_wavepostpnt
 
 elif [ $step = "wavegempak" ]; then

diff --git a/scripts/exgfs_wave_post_pnt.sh b/scripts/exgfs_wave_post_pnt.sh
@@ -364,18 +364,20 @@
     fhr=$fhrp # no gridded output, loop with out_pnt stride
   done
 
-  if [ "$DOSPC_WAV" = 'YES' ] && [ "$DOBLL_WAV" = "NO" ]; then
+  if [ "$DOSPC_WAV" = 'YES' ]; then
     sed -e "s/TIME/$tstart/g" \
         -e "s/DT/$dtspec/g" \
 	-e "s/999/$N/g" \
         -e "s|POINT|$points|g" \
         -e "s/ITYPE/1/g" \
         -e "s/FORMAT/F/g" \
                                ww3_outp_spec.inp.tmpl > ww3_outp.inp
-
+   
     $EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_spec.log 2>&1
 
-  elif [ "$DOSPC_WAV" = 'NO' ] && [ "$DOBLL_WAV" = "YES" ]; then
+  fi
+
+  if [ "$DOBLL_WAV" = "YES" ]; then
     sed -e "s/TIME/$tstart/g" \
         -e "s/DT/$dtspec/g" \
         -e "s/999/$N/g" \
@@ -384,27 +386,6 @@
 	                       ww3_outp_bull.inp.tmpl > ww3_outp.inp
 
     $EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_bull.log 2>&1
-
-  elif [[ "$DOSPC_WAV" == "YES" && "$DOBLL_WAV" == "YES" ]]; then
-    sed -e "s/TIME/$tstart/g" \
-        -e "s/DT/$dtspec/g" \
-        -e "s/999/$N/g" \
-        -e "s|POINT|$points|g" \
-        -e "s/ITYPE/1/g" \
-        -e "s/FORMAT/F/g" \
-                               ww3_outp_spec.inp.tmpl > ww3_outp.inp
-
-    $EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_spec.log 2>&1
-
-    sed -e "s/TIME/$tstart/g" \
-        -e "s/DT/$dtspec/g" \
-        -e "s/999/$N/g" \
-        -e "s|POINT|$points|g" \
-        -e "s/REFT/$truntime/g" \
-                               ww3_outp_bull.inp.tmpl > ww3_outp.inp
-
-    $EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_bull.log 2>&1
-
   fi
 
 # --------------------------------------------------------------------------- #