Merge hash from dev with io changes for cycle.f90

reg_tests/global_cycle/C192.gsitile_lndincsoilnoahmp.sh

@@ -38,7 +38,6 @@ export use_ufo=.true.
 
 export DO_SFCCYCLE=".FALSE." 
 export GCYCLE_DO_SOILINCR=".true."
-export GCYCLE_INTERP_LANDINCR=".false."
 export LSOIL_INCR=3
 
 export VERBOSE=YES

reg_tests/global_cycle/C192.jedi_lndincsoilnoahmp.sh

@@ -40,7 +40,6 @@ export use_ufo=.true.
 
 export DO_SFCCYCLE=".FALSE." 
 export GCYCLE_DO_SOILINCR=".true."
-export GCYCLE_INTERP_LANDINCR=".false."
 export SOILINCR_FNAME="soil_sfcincr_jedi"
 export LSOIL_INCR=3
 

reg_tests/global_cycle/C768.lndincsnow.sh

@@ -32,7 +32,6 @@ export FNACNA=$COMIN/gdas.t00z.seaice.5min.blend.grb
 export NST_FILE=$COMIN/gdas.t00z.dtfanl.nc
 
 export GCYCLE_DO_SNOWINCR=.true. # must be lower-case.
-export GCYCLE_INTERP_LANDINCR=.false.
 export JCAP=1534
 export LONB=3072
 export LATB=1536

reg_tests/global_cycle/driver.hercules.sh

@@ -64,37 +64,31 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
-      -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
+      -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
 export COMOUT=$DATA
-TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
-      -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
+TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
+      -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
 
 LOG_FILE=consistency.log04
 export DATA="${DATA_DIR}/test4"
 export COMOUT=$DATA
-TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
-      -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
+TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
-     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
-
-LOG_FILE=consistency.log06
-export DATA="${DATA_DIR}/test6"
-export COMOUT=$DATA
-TEST6=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
      -o $LOG_FILE -e $LOG_FILE ./C192.gsitile_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\
-      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF

reg_tests/global_cycle/driver.jet.sh

@@ -64,37 +64,31 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
-      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
+      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
 export COMOUT=$DATA
-TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
-      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
+TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
+      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
 
 LOG_FILE=consistency.log04
 export DATA="${DATA_DIR}/test4"
 export COMOUT=$DATA
-TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
-      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
+TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
-     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
-
-LOG_FILE=consistency.log06
-export DATA="${DATA_DIR}/test6"
-export COMOUT=$DATA
-TEST6=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
      --partition=xjet -o $LOG_FILE -e $LOG_FILE ./C192.gsitile_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --partition=xjet --nodes=1  -t 0:01:00 -A $PROJECT_CODE -J summary -o $LOG_FILE -e $LOG_FILE \
        --open-mode=append -q $QUEUE -d\
-       afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6 << EOF
+       afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}* > ./summary.log
 EOF

reg_tests/global_cycle/driver.orion.sh

@@ -64,37 +64,31 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
-      -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
+      -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
 export COMOUT=$DATA
-TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
-      -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
+TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
+      -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
 
 LOG_FILE=consistency.log04
 export DATA="${DATA_DIR}/test4"
 export COMOUT=$DATA
-TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
-      -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
+TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
-     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
-
-LOG_FILE=consistency.log06
-export DATA="${DATA_DIR}/test6"
-export COMOUT=$DATA
-TEST6=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
      -o $LOG_FILE -e $LOG_FILE ./C192.gsitile_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\
-      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF

reg_tests/global_cycle/driver.ursa.sh

@@ -64,37 +64,31 @@ TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gsi_lndincsoilnoahmp \
-     -o $LOG_FILE -e $LOG_FILE ./C192.gsi_lndincsoilnoahmp.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
+     -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
 
 LOG_FILE=consistency.log03
 export DATA="${DATA_DIR}/test3"
 export COMOUT=$DATA
-TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.lndincsnow \
-     -o $LOG_FILE -e $LOG_FILE ./C768.lndincsnow.sh)
+TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
+      -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
 
 LOG_FILE=consistency.log04
 export DATA="${DATA_DIR}/test4"
 export COMOUT=$DATA
-TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c48.noahmp.coupled \
-      -o $LOG_FILE -e $LOG_FILE ./C48.noahmp.coupled.sh)
+TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
-     -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
-
-LOG_FILE=consistency.log06
-export DATA="${DATA_DIR}/test6"
-export COMOUT=$DATA
-TEST6=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J C192.gsitile_lndincsoilnoahmp \
      -o $LOG_FILE -e $LOG_FILE ./C192.gsitile_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\
-      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF

reg_tests/global_cycle/driver.wcoss2.sh

@@ -68,30 +68,25 @@ TEST1=$(qsub -V -o ${LOG_FILE}01 -e ${LOG_FILE}01 -q $QUEUE -A $PROJECT_CODE -l
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
 TEST2=$(qsub -V -o ${LOG_FILE}02 -e ${LOG_FILE}02 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
-        -N c192.gsi_lndincsoilnoahmp -l select=1:ncpus=12:mem=8GB $PWD/C192.gsi_lndincsoilnoahmp.sh)
+        -N c768.lndincsnow -l select=1:ncpus=12:mem=8GB $PWD/C768.lndincsnow.sh)
 
 export DATA="${DATA_DIR}/test3"
 export COMOUT=$DATA
 TEST3=$(qsub -V -o ${LOG_FILE}03 -e ${LOG_FILE}03 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
-        -N c768.lndincsnow -l select=1:ncpus=12:mem=8GB $PWD/C768.lndincsnow.sh)
+        -N c48.noahmp.coupled -l select=1:ncpus=12:mem=8GB $PWD/C48.noahmp.coupled.sh)
 
 export DATA="${DATA_DIR}/test4"
 export COMOUT=$DATA
 TEST4=$(qsub -V -o ${LOG_FILE}04 -e ${LOG_FILE}04 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
-        -N c48.noahmp.coupled -l select=1:ncpus=12:mem=8GB $PWD/C48.noahmp.coupled.sh)
+        -N c192.jedi_lndincsoilnoahmp -l select=1:ncpus=12:mem=8GB $PWD/C192.jedi_lndincsoilnoahmp.sh)
 
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
 TEST5=$(qsub -V -o ${LOG_FILE}05 -e ${LOG_FILE}05 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
-        -N c192.jedi_lndincsoilnoahmp -l select=1:ncpus=12:mem=8GB $PWD/C192.jedi_lndincsoilnoahmp.sh)
-
-export DATA="${DATA_DIR}/test6"
-export COMOUT=$DATA
-TEST6=$(qsub -V -o ${LOG_FILE}06 -e ${LOG_FILE}06 -q $QUEUE -A $PROJECT_CODE -l walltime=00:05:00 \
         -N c192.gsitile_lndincsoilnoahmp -l select=1:ncpus=12:mem=8GB $PWD/C192.gsitile_lndincsoilnoahmp.sh)
 
 qsub -V -o ${LOG_FILE} -e ${LOG_FILE} -q $QUEUE -A $PROJECT_CODE -l walltime=00:01:00 \
-        -N cycle_summary -l select=1:ncpus=1:mem=100MB -W depend=afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6 << EOF
+        -N cycle_summary -l select=1:ncpus=1:mem=100MB -W depend=afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 cd $reg_dir
 grep -a '<<<' ${LOG_FILE}?? | grep -v echo > summary.log