Merge branch 'feature/href_fixes' of https://github.com/BinbinZhou-NO…

…AA/EVS into feature/href_fixes * 'feature/href_fixes' of https://github.com/BinbinZhou-NOAA/EVS: Fix exevs_href_precip_stats.sh and exevs_href_spcoutlook_stats.sh Fix ush/cam/evs_href_prepare.sh Update for MDMP
BinbinZhou-NOAA · Nov 7, 2024 · 1fbbd28 · 1fbbd28
2 parents d129250 + 404609b
commit 1fbbd28
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 35 deletions.
diff --git a/scripts/stats/cam/exevs_href_grid2obs_stats.sh b/scripts/stats/cam/exevs_href_grid2obs_stats.sh
@@ -12,6 +12,7 @@ set -x
 export machine=${machine:-"WCOSS2"}
 export WORK=$DATA
 cd $WORK
+mkdir -p $WORK/scripts
 
 #lvl = profile or sfc or both
 export lvl='both'
@@ -95,43 +96,43 @@ fi
 #*****************************************
 # Build a POE script to collect sub-jobs
 #****************************************
->run_href_all_grid2obs_poe
+>$DATA/scripts/run_href_all_grid2obs_poe
 
 #system: 10 jobs (8 on CONUS, 2 on Alaska)
 if [ $verif_system = yes ] ; then 
   $USHevs/cam/evs_href_grid2obs_system.sh 
   export err=$?; err_chk
-  cat ${DATA}/run_all_href_system_poe.sh >> run_href_all_grid2obs_poe
+  cat ${DATA}/scripts/run_all_href_system_poe.sh >> $DATA/scripts/run_href_all_grid2obs_poe
 fi
 
 #profile: total 10 jobs (4 for conus and 2 for alaska)
 if [ $verif_profile = yes ] ; then 
   $USHevs/cam/evs_href_grid2obs_profile.sh $domain
   export err=$?; err_chk
-  cat ${DATA}/run_all_href_profile_poe.sh >> run_href_all_grid2obs_poe 
+  cat ${DATA}/scripts/run_all_href_profile_poe.sh >> $DATA/scripts/run_href_all_grid2obs_poe 
 fi 
 
 #Product: 16 jobs
 if [ $verif_product = yes ] ; then
   $USHevs/cam/evs_href_grid2obs_product.sh
   export err=$?; err_chk
-  cat ${DATA}/run_all_href_product_poe.sh >> run_href_all_grid2obs_poe
+  cat ${DATA}/scripts/run_all_href_product_poe.sh >> $DATA/scripts/run_href_all_grid2obs_poe
 fi
 
 
 #totall: 36 jobs for all (both conus and alaska, profile, system and product)
-chmod 775 run_href_all_grid2obs_poe
+chmod 775 $DATA/scripts/run_href_all_grid2obs_poe
 
 
 #*************************************************
 # Run the POE script to generate small stat files
 #*************************************************
-if [ -s run_href_all_grid2obs_poe ] ; then
+if [ -s $DATA/scripts/run_href_all_grid2obs_poe ] ; then
  if [ $run_mpi = yes ] ; then
-    mpiexec -np 72 -ppn 72 --cpu-bind verbose,depth cfp  ${DATA}/run_href_all_grid2obs_poe
+    mpiexec -np 72 -ppn 72 --cpu-bind verbose,depth cfp  ${DATA}/scripts/run_href_all_grid2obs_poe
     export err=$?; err_chk
  else
-    ${DATA}/run_href_all_grid2obs_poe
+    ${DATA}/scripts/run_href_all_grid2obs_poe
     export err=$?; err_chk
  fi
 fi

diff --git a/scripts/stats/cam/exevs_href_precip_stats.sh b/scripts/stats/cam/exevs_href_precip_stats.sh
@@ -18,6 +18,7 @@ export err=$?; err_chk
 
 export WORK=$DATA
 cd $WORK
+mkdir -p $WORK/scripts
 
 export run_mpi=${run_mpi:-'yes'}
 export verif_precip=${verif_precip:-'yes'}
@@ -70,33 +71,33 @@ fi
 #***************************************
 # Build a POE script to collect sub-jobs
 # **************************************
-> run_all_precip_poe.sh
+>$DATA/scripts/run_all_precip_poe.sh
 
 # Build sub-jobs for precip
 if [ $verif_precip = yes ] ; then
  $USHevs/cam/evs_href_precip.sh
  export err=$?; err_chk
- cat ${DATA}/run_all_href_precip_poe.sh >> run_all_precip_poe.sh
+ cat ${DATA}/scripts/run_all_href_precip_poe.sh >> $DATA/scripts/run_all_precip_poe.sh
 fi
 
 # Build sub-jobs for snowfall
 if [ $verif_snowfall = yes ] ; then
  $USHevs/cam/evs_href_snowfall.sh
  export err=$?; err_chk
- cat ${DATA}/run_all_href_snowfall_poe.sh >> run_all_precip_poe.sh
+ cat ${DATA}/scripts/run_all_href_snowfall_poe.sh >> $DATA/scripts/run_all_precip_poe.sh
 fi
 
 #*************************************************
 # Run the POE script to generate small stat files
 #*************************************************
-if [ -s ${DATA}/run_all_precip_poe.sh ]  ; then
-  chmod 775 run_all_precip_poe.sh
+if [ -s ${DATA}/scripts/run_all_precip_poe.sh ]  ; then
+  chmod 775 ${DATA}/scripts/run_all_precip_poe.sh
 
   if [ $run_mpi = yes ] ; then
-    mpiexec  -n 44 -ppn 44 --cpu-bind core --depth=2 cfp ${DATA}/run_all_precip_poe.sh
+    mpiexec  -n 44 -ppn 44 --cpu-bind core --depth=2 cfp ${DATA}/scripts/run_all_precip_poe.sh
     export err=$?; err_chk
   else
-   ${DATA}/run_all_precip_poe.sh
+   ${DATA}/scripts/run_all_precip_poe.sh
     export err=$?; err_chk
   fi
 

diff --git a/scripts/stats/cam/exevs_href_spcoutlook_stats.sh b/scripts/stats/cam/exevs_href_spcoutlook_stats.sh
@@ -12,6 +12,7 @@ set -x
 export machine=${machine:-"WCOSS2"}
 export WORK=$DATA
 cd $WORK
+mkdir -p $WORK/scripts
 
 #*********************************
 #check input data are available:
@@ -73,26 +74,26 @@ fi
 #****************************************
 # Build a POE script to collect sub-jobs
 # ***************************************
->run_href_all_grid2obs_poe
+>$DATA/scripts/run_href_all_grid2obs_poe
 
 #Spc_outlook: 2 job
 if [ $verif_spcoutlook = yes ] ; then
   $USHevs/cam/evs_href_spcoutlook.sh
   export err=$?; err_chk
-  cat ${DATA}/run_all_href_spcoutlook_poe.sh >> run_href_all_grid2obs_poe
+  cat ${DATA}/scripts/run_all_href_spcoutlook_poe.sh >> $DATA/scripts/run_href_all_grid2obs_poe
 fi
 
-chmod 775 run_href_all_grid2obs_poe
 
 #****************************************
 # Run POE script to get small stat files
 # ***************************************
-if [ -s run_href_all_grid2obs_poe ] ; then
+if [ -s $DATA/scripts/run_href_all_grid2obs_poe ] ; then
+ chmod 775 $DATA/scripts/run_href_all_grid2obs_poe
  if [ $run_mpi = yes ] ; then
-    mpiexec -np 2 -ppn 2 --cpu-bind verbose,core cfp  ${DATA}/run_href_all_grid2obs_poe
+    mpiexec -np 2 -ppn 2 --cpu-bind verbose,core cfp  ${DATA}/scripts/run_href_all_grid2obs_poe
     export err=$?; err_chk
  else
-    ${DATA}/run_href_all_grid2obs_poe
+    ${DATA}/scripts/run_href_all_grid2obs_poe
     export err=$?; err_chk
  fi
 fi

diff --git a/ush/cam/evs_href_gather.sh b/ush/cam/evs_href_gather.sh
@@ -36,6 +36,7 @@ for MODL in $MODELS ; do
 #************************************************
 # Build sub-jobs
 #***********************************************
+cd $DATA/scripts
 >run_gather_${verify}_${MODL}.sh
 
     echo  "export output_base=${WORK}/gather" >> run_gather_${verify}_${MODL}.sh 
@@ -63,7 +64,7 @@ for MODL in $MODELS ; do
 
     chmod +x run_gather_${verify}_${MODL}.sh
 
-    echo "${DATA}/run_gather_${verify}_${MODL}.sh" >> run_gather_all_poe.sh    
+    echo "${DATA}/scripts/run_gather_${verify}_${MODL}.sh" >> run_gather_all_poe.sh    
 
 done
 
@@ -73,9 +74,9 @@ chmod 775 run_gather_all_poe.sh
 #  Run the POE script
 #*****************************
 if [ $run_mpi = yes ] ; then
-  mpiexec -np 3 -ppn 3 --cpu-bind verbose,depth cfp ${DATA}/run_gather_all_poe.sh
+  mpiexec -np 3 -ppn 3 --cpu-bind verbose,depth cfp ${DATA}/scripts/run_gather_all_poe.sh
   export err=$?; err_chk
 else
-  ${DATA}/run_gather_all_poe.sh
+  ${DATA}/scripts/run_gather_all_poe.sh
   export err=$?; err_chk
 fi
diff --git a/ush/cam/evs_href_grid2obs_product.sh b/ush/cam/evs_href_grid2obs_product.sh
@@ -10,6 +10,7 @@ set -x
 #*******************************************
 # Build POE script to collect sub-jobs
 #******************************************
+cd $DATA/scripts
 >run_all_href_product_poe.sh
 
 obsv='prepbufr'
@@ -116,7 +117,7 @@ for prod in mean prob ; do
        echo "[[ \$? = 0 ]] && >$COMOUTrestart/product/run_href_${model}.${dom}.${valid_run}.${fhr}_product.completed" >> run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh
 
        chmod +x run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh
-       echo "${DATA}/run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh" >> run_all_href_product_poe.sh
+       echo "${DATA}/scripts/run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh" >> run_all_href_product_poe.sh
       fi
 
      fi 
@@ -193,7 +194,7 @@ for prod in mean prob ; do
        echo "[[ \$? = 0 ]] && >$COMOUTrestart/product/run_href_${model}.${dom}.${valid_run}.${fhr}_product.completed" >> run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh
 
        chmod +x run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh
-       echo "${DATA}/run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh" >> run_all_href_product_poe.sh
+       echo "${DATA}/scripts/run_href_${model}.${dom}.${valid_run}.${fhr}.product.sh" >> run_all_href_product_poe.sh
 
       fi 
 

diff --git a/ush/cam/evs_href_grid2obs_profile.sh b/ush/cam/evs_href_grid2obs_profile.sh
@@ -16,6 +16,7 @@ fi
 #*******************************************
 # Build POE script to collect sub-jobs
 #******************************************
+cd $DATA/scripts
 >run_all_href_profile_poe.sh
 
 
@@ -141,7 +142,7 @@ for dom in $domains ; do
 	echo "[[ \$? = 0 ]] && >$COMOUTrestart/profile/run_href_${domain}.${valid_at}.${fhr}_profile.completed" >> run_href_${domain}.${valid_at}.${fhr}_profile.sh
 
        chmod +x run_href_${domain}.${valid_at}.${fhr}_profile.sh
-       echo "${DATA}/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
+       echo "${DATA}/scripts/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
 
        fi
 
@@ -258,7 +259,7 @@ for dom in $domains ; do
 
 
 	chmod +x run_href_${domain}.${valid_at}.${fhr}_profile.sh
-        echo "${DATA}/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
+        echo "${DATA}/scripts/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
 
        fi 	
       fi
@@ -367,7 +368,7 @@ for dom in $domains ; do
         echo "[[ \$? = 0 ]] && >$COMOUTrestart/profile/run_href_${domain}.${valid_at}.${fhr}_profile.completed" >> run_href_${domain}.${valid_at}.${fhr}_profile.sh
 
         chmod +x run_href_${domain}.${valid_at}.${fhr}_profile.sh
-        echo "${DATA}/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
+        echo "${DATA}/scripts/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
 
        fi	
       fi
@@ -477,7 +478,7 @@ for dom in $domains ; do
         echo "[[ \$? = 0 ]] && >$COMOUTrestart/profile/run_href_${domain}.${valid_at}.${fhr}_profile.completed" >> run_href_${domain}.${valid_at}.${fhr}_profile.sh
 
         chmod +x run_href_${domain}.${valid_at}.${fhr}_profile.sh
-        echo "${DATA}/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
+        echo "${DATA}/scripts/run_href_${domain}.${valid_at}.${fhr}_profile.sh" >> run_all_href_profile_poe.sh
 
        fi	
       fi

diff --git a/ush/cam/evs_href_grid2obs_system.sh b/ush/cam/evs_href_grid2obs_system.sh
@@ -9,6 +9,7 @@ set -x
 #*******************************************
 # Build POE script to collect sub-jobs
 #******************************************
+cd $DATA/scripts
 >run_all_href_system_poe.sh
 
 export obsv=prepbufr
@@ -177,7 +178,7 @@ for dom in CONUS Alaska ; do
          echo "[[ \$? = 0 ]] && >$COMOUTrestart/system/run_href_${domain}.${valid_at}.${fhr}_system.completed" >> run_href_${domain}.${valid_at}.${fhr}_system.sh
 
          chmod +x run_href_${domain}.${valid_at}.${fhr}_system.sh
-         echo "${DATA}/run_href_${domain}.${valid_at}.${fhr}_system.sh" >> run_all_href_system_poe.sh
+         echo "${DATA}/scripts/run_href_${domain}.${valid_at}.${fhr}_system.sh" >> run_all_href_system_poe.sh
 
         fi
 
@@ -292,7 +293,7 @@ for dom in CONUS Alaska ; do
 	 echo "[[ \$? = 0 ]] && >$COMOUTrestart/system/run_href_${domain}.${valid_at}.${fhr}_system.completed" >> run_href_${domain}.${valid_at}.${fhr}_system.sh
 
          chmod +x run_href_${domain}.${valid_at}.${fhr}_system.sh
-         echo "${DATA}/run_href_${domain}.${valid_at}.${fhr}_system.sh" >> run_all_href_system_poe.sh
+         echo "${DATA}/scripts/run_href_${domain}.${valid_at}.${fhr}_system.sh" >> run_all_href_system_poe.sh
 
 	fi 
 

diff --git a/ush/cam/evs_href_precip.sh b/ush/cam/evs_href_precip.sh
@@ -11,6 +11,7 @@ set -x
 #*******************************************
 # Build POE script to collect sub-jobs 
 #******************************************
+cd $DATA/scripts
 >run_all_href_precip_poe.sh
 
 
@@ -491,7 +492,7 @@ for obsvtype in ccpa mrms ; do
                 echo "[[ \$? = 0 ]] && >$COMOUTrestart/${prod}/run_href_precip_${prod}.${obsv}.f${fhr}.v${vhr}.completed" >> run_href_precip_${prod}.${obsv}.f${fhr}.v${vhr}.sh 
 
                 chmod +x run_href_precip_${prod}.${obsv}.f${fhr}.v${vhr}.sh
-                echo "${DATA}/run_href_precip_${prod}.${obsv}.f${fhr}.v${vhr}.sh" >> run_all_href_precip_poe.sh
+                echo "${DATA}/scripts/run_href_precip_${prod}.${obsv}.f${fhr}.v${vhr}.sh" >> run_all_href_precip_poe.sh
 
                fi #end if check input files
 

diff --git a/ush/cam/evs_href_snowfall.sh b/ush/cam/evs_href_snowfall.sh
@@ -10,6 +10,7 @@ set -x
 # Build POE script to collect sub-jobs 
 #******************************************
 export write_job_cards=yes
+cd $DATA/scripts
 >run_all_href_snowfall_poe.sh
 
 mkdir -p $COMOUTsmall/HREF_SNOW
@@ -138,7 +139,7 @@ for obsv in 6h 24h  ; do
 	    echo "[[ \$? = 0 ]] && >$COMOUTrestart/snow/run_href_snow${obsv}.${fhr}.${vhr}.completed" >> run_href_snow${obsv}.${fhr}.${vhr}.sh
 
 	    chmod +x run_href_snow${obsv}.${fhr}.${vhr}.sh
-            echo "${DATA}/run_href_snow${obsv}.${fhr}.${vhr}.sh" >> run_all_href_snowfall_poe.sh
+            echo "${DATA}/scripts/run_href_snow${obsv}.${fhr}.${vhr}.sh" >> run_all_href_snowfall_poe.sh
 
 	   fi   
 	  fi #end if check restart

diff --git a/ush/cam/evs_href_spcoutlook.sh b/ush/cam/evs_href_spcoutlook.sh
@@ -87,6 +87,7 @@ cd $WORK
 #*******************************************
 # Build POE script to collect sub-jobs
 #******************************************
+cd $DATA/scripts
 >run_all_href_spcoutlook_poe.sh
 
 obsv='prepbufr'
@@ -163,7 +164,7 @@ for prod in mean ; do
        echo "[[ \$? = 0 ]] && >$COMOUTrestart/spcoutlook/run_href_${model}.${dom}.${valid}.${fhr}_spcoutlook.completed" >> run_href_${model}.${dom}.${valid}.${fhr}_spcoutlook.sh
 
        chmod +x run_href_${model}.${dom}.${valid}.${fhr}_spcoutlook.sh
-       echo "${DATA}/run_href_${model}.${dom}.${valid}.${fhr}_spcoutlook.sh" >> run_all_href_spcoutlook_poe.sh
+       echo "${DATA}/scripts/run_href_${model}.${dom}.${valid}.${fhr}_spcoutlook.sh" >> run_all_href_spcoutlook_poe.sh
 
       fi