Merge pull request #1 from MinsukJi-NOAA/feature/alt_compsetrun

Merge in latest rt.sh-related changes from alt_compsetrun to orion cloned from Denise

tests/default_vars.sh

@@ -27,13 +27,52 @@ elif [ $MACHINE_ID = wcoss_dell_p3 ]; then
   TASKS_stretch=48 ; TPN_stretch=28 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=28 ; INPES_strnest=2 ; JNPES_strnest=4
 
+elif [[ $MACHINE_ID = orion.* ]]; then
+
+  TASKS_dflt=150 ; TPN_dflt=24 ; INPES_dflt=3 ; JNPES_dflt=8
+  TASKS_thrd=84  ; TPN_thrd=12 ; INPES_thrd=3 ; JNPES_thrd=4
+  TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
+  TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
+
+  TASKS_cpl_dflt=318; TPN_cpl_dflt=40; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
+  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
+  OPB_cpl_dflt="150 269"; IPB_cpl_dflt="270 317"
+
+  TASKS_cpl_thrd=246; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
+  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
+  OPB_cpl_thrd="78 197";  IPB_cpl_thrd="198 245"
+
+  TASKS_cpl_bmrk=480; TPN_cpl_bmrk=40; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8
+  THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311"
+  OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"
+
+  TASKS_cpl_wwav=520; TPN_cpl_wwav=40; INPES_cpl_wwav=6; JNPES_cpl_wwav=8
+  THRD_cpl_wwav=1; WPG_cpl_wwav=24; MPB_cpl_wwav="0 287"; APB_cpl_wwav="0 311"
+  OPB_cpl_wwav="312 431"; IPB_cpl_wwav="432 479"; WPB_cpl_wwav="480 519"
+
 elif [[ $MACHINE_ID = hera.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=40 ; INPES_dflt=3 ; JNPES_dflt=8
   TASKS_thrd=84  ; TPN_thrd=20 ; INPES_thrd=3 ; JNPES_thrd=4
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
 
+  TASKS_cpl_dflt=318; TPN_cpl_dflt=40; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
+  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
+  OPB_cpl_dflt="150 269"; IPB_cpl_dflt="270 317"
+
+  TASKS_cpl_thrd=246; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
+  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
+  OPB_cpl_thrd="78 197";  IPB_cpl_thrd="198 245"
+
+  TASKS_cpl_bmrk=480; TPN_cpl_bmrk=40; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8
+  THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311"
+  OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"
+
+  TASKS_cpl_wwav=520; TPN_cpl_wwav=40; INPES_cpl_wwav=6; JNPES_cpl_wwav=8
+  THRD_cpl_wwav=1; WPG_cpl_wwav=24; MPB_cpl_wwav="0 287"; APB_cpl_wwav="0 311"
+  OPB_cpl_wwav="312 431"; IPB_cpl_wwav="432 479"; WPB_cpl_wwav="480 519"
+
 elif [[ $MACHINE_ID = jet.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=24 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -199,10 +238,22 @@ export IAU_DRYMASSFIXER=.false.
 
 export_cpl ()
 { 
-export TASKS=318
-export ATMRES=''
+export TASKS=$TASKS_cpl_dflt
+export TPN=$TPN_cpl_dflt
+export INPES=$INPES_cpl_dflt
+export JNPES=$JNPES_cpl_dflt
+export THRD=$THRD_cpl_dflt
+
+export WRTTASK_PER_GROUP=$WPG_cpl_dflt
+export med_petlist_bounds=$MPB_cpl_dflt
+export atm_petlist_bounds=$APB_cpl_dflt
+export ocn_petlist_bounds=$OPB_cpl_dflt
+export ice_petlist_bounds=$IPB_cpl_dflt
+
+export ATMRES='C96'
 export OCNRES='025'
-export SUITE_NAME="FV3_GFS_2017_coupled"
+export SUITE_NAME=''
+export MED_restart_data=''
 export INPUT_NML="input.mom6.nml.IN"
 export FIELD_TABLE="field_table"
 export NSOUT='-1'
@@ -214,6 +265,7 @@ export med_model="nems"
 export atm_model="fv3"
 export ocn_model="mom6"
 export ice_model="cice"
+export wav_model="ww3"
 # future use: for MOM6 river runoff 
 export MOM6_RIVER_RUNOFF='True'
 export NPROC_ICE='48'
@@ -239,9 +291,4 @@ export NA_INIT='1'
 export EXTERNAL_IC='.T.'
 export NGGPS_IC='.T.'
 export MOUNTAIN='.F.'
-
-export med_petlist_bounds="0 143"
-export atm_petlist_bounds="0 149"
-export ocn_petlist_bounds="150 269"
-export ice_petlist_bounds="270 317"
 }

tests/detect_machine.sh

@@ -92,6 +92,11 @@ case $(hostname -f) in
   tfe1)                    MACHINE_ID=jet ;; ### jet09
   tfe2)                    MACHINE_ID=jet ;; ### jet10
 
+  Orion-login-1.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1
+  Orion-login-2.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion2
+  Orion-login-3.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion3
+  Orion-login-4.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion4
+
   cheyenne1.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
   cheyenne2.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne2
   cheyenne3.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne3
@@ -115,7 +120,7 @@ esac
 MACHINE_ID=${NEMS_MACHINE:-${MACHINE_ID}}
 
 # Append compiler
-if [ $MACHINE_ID = hera ] || [ $MACHINE_ID = cheyenne ] || [ $MACHINE_ID = jet ] || [ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] ; then
+if [ $MACHINE_ID = orion ] || [ $MACHINE_ID = hera ] || [ $MACHINE_ID = cheyenne ] || [ $MACHINE_ID = jet ] || [ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] ; then
     MACHINE_ID=${MACHINE_ID}.${COMPILER}
 fi
 

tests/edit_inputs.sh

@@ -8,7 +8,7 @@ function edit_ice_in {
   fi
 
   jday=$(date -d "${SYEAR}-${SMONTH}-${SDAY} ${SHOUR}:00:00" +%j)
-  istep0=$(( ((jday-1)*86400 + 10#$SHOUR*3600) / DT_CICE ))
+  istep0=$(( ((10#$jday-1)*86400 + 10#$SHOUR*3600) / DT_CICE ))
 
   sed -e "s/YEAR_INIT/$SYEAR/g" \
       -e "s/ISTEP0/$istep0/g" \

tests/fv3_conf/cpld_fv3_ccpp_mom6_cice_cold_atm_flux_run.IN → tests/fv3_conf/cpld_fv3_mom6_cice_atm_flux_run.IN

@@ -1,8 +1,10 @@
 mkdir INPUT RESTART history MOM6_OUTPUT MOM6_RESTART restart
 
-FV3_DIR=FV3_input_data
-MOM6_DIR=MOM6_IC
-CICE5_DIR=UGCS_input_data
+if [[ $ATMRES == 'C96' ]]; then
+  FV3_DIR=FV3_input_data
+else
+  FV3_DIR=FV3_input_data${ATMRES#C}
+fi
 
 # FV3 fixed input
 cp    @[RTPWD]/${FV3_DIR}/INPUT/aerosol.dat .
@@ -14,29 +16,34 @@ if [ $OZ_PHYS_NEW = .T. ]; then
 elif [ $OZ_PHYS_OLD = .T. ]; then
   cp  @[RTPWD]/${FV3_DIR}/INPUT/global_o3prdlos.f77 .
 fi
-if [ $H2O_PHYS = .T. ]; then
-  cp  @[RTPWD]/${FV3_DIR}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-fi
+cp    @[RTPWD]/${FV3_DIR}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
 cp    @[RTPWD]/${FV3_DIR}/*grb .
-cp    @[RTPWD]/${FV3_DIR}/field_table .
-#cp    @[RTPWD]/${FV3_DIR}/*configure .
-cp    @[RTPWD]/CPL_FIX/aC96o025/grid_spec.nc ./INPUT
-cp    @[RTPWD]/${FV3_DIR}/INPUT/C96_grid*.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
+cp    @[RTPWD]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
 cp    @[RTPWD]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
-cp    @[RTPWD]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/C96_mosaic.nc
+cp    @[RTPWD]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
 cp    @[RTPWD]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
 
 # MOM6 fixed input
-cp    @[RTPWD]/MOM6_FIX/025/* ./INPUT
+cp    @[RTPWD]/MOM6_FIX/@[OCNRES]/* ./INPUT
 
 # CICE5 fixed input
-cp    @[RTPWD]/CICE_FIX/025/grid_cice_NEMS_mx025.nc .
-cp    @[RTPWD]/CICE_FIX/025/kmtu_cice_NEMS_mx025.nc .
+cp    @[RTPWD]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx025.nc .
+cp    @[RTPWD]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx025.nc .
 
-#ICs
+# ICs
 cp    @[RTPWD]/${FV3_DIR}/INPUT/sfc_data*.nc ./INPUT
 cp    @[RTPWD]/${FV3_DIR}/INPUT/gfs_data*.nc ./INPUT
 cp    @[RTPWD]/MOM6_IC/MOM*.nc ./INPUT
 cp    @[RTPWD]/CICE_IC/cice5_model_0.25.*.nc ./cice5_model.res.nc
 
-cp ${PATHTR}/FV3/ccpp/suites/suite_${SUITE_NAME}.xml .
+# WARM START
+if [[ ! $MED_restart_data == '' ]]; then
+  cp  @[RTPWD]/@[MED_restart_data]/mediator_* .
+fi
+
+# CCPP
+if [[ ! $SUITE_NAME == '' ]]; then
+  cp  ${PATHTR}/FV3/ccpp/suites/suite_@[SUITE_NAME].xml .
+fi

tests/fv3_conf/cpld_fv3_mom6_cice_bmark_rt_run.IN

@@ -0,0 +1,54 @@
+mkdir INPUT RESTART history MOM6_OUTPUT MOM6_RESTART restart
+
+if [[ $ATMRES == 'C96' ]]; then
+  FV3_DIR=FV3_input_data
+else
+  FV3_DIR=FV3_input_data${ATMRES#C}
+fi
+
+BM_IC=BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}
+FV3_IC=${BM_IC}/gfs/@[ATMRES]/INPUT
+MOM6_IC=${BM_IC}/mom6_da
+CICE_IC=${BM_IC}/cpc
+
+# FV3 fixed input
+cp    @[RTPWD]/${FV3_DIR}/INPUT/aerosol.dat .
+cp    @[RTPWD]/FV3_input_bm2/INPUT/co2historicaldata_201*.txt .
+cp    @[RTPWD]/${FV3_DIR}/INPUT/sfc_emissivity_idx.txt .
+cp    @[RTPWD]/${FV3_DIR}/INPUT/solarconstant_noaa_an.txt .
+if [ $OZ_PHYS_NEW = .T. ]; then
+  cp  @[RTPWD]/${FV3_DIR}/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
+elif [ $OZ_PHYS_OLD = .T. ]; then
+  cp  @[RTPWD]/${FV3_DIR}/INPUT/global_o3prdlos.f77 .
+fi
+cp    @[RTPWD]/${FV3_DIR}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
+cp    @[RTPWD]/${FV3_DIR}/*grb .
+cp    @[RTPWD]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
+cp    @[RTPWD]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
+cp    @[RTPWD]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
+
+# MOM6 fixed input
+cp    @[RTPWD]/MOM6_FIX/@[OCNRES]/* ./INPUT
+
+# CICE5 fixed input
+cp    @[RTPWD]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx025.nc .
+cp    @[RTPWD]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx025.nc .
+
+# ICs
+cp    @[RTPWD]/${FV3_IC}/sfc_data*.nc ./INPUT
+cp    @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
+cp    @[RTPWD]/${MOM6_IC}/MOM*.nc ./INPUT
+cp    @[RTPWD]/${CICE_IC}/cice5_model_0.25.*.nc ./cice5_model.res.nc
+
+# WARM START
+if [[ ! $MED_restart_data == '' ]]; then
+  cp  @[RTPWD]/@[MED_restart_data]/mediator_* .
+fi
+
+# CCPP
+if [[ ! $SUITE_NAME == '' ]]; then
+  cp ${PATHTR}/FV3/ccpp/suites/suite_@[SUITE_NAME].xml .
+fi

tests/fv3_conf/cpld_fv3_mom6_cice_ww3_bmark_rt_run.IN

@@ -0,0 +1,58 @@
+mkdir INPUT RESTART history MOM6_OUTPUT MOM6_RESTART restart
+
+if [[ $ATMRES == 'C96' ]]; then
+  FV3_DIR=FV3_input_data
+else
+  FV3_DIR=FV3_input_data${ATMRES#C}
+fi
+
+BM_IC=BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}
+FV3_IC=${BM_IC}/gfs/@[ATMRES]/INPUT
+MOM6_IC=${BM_IC}/mom6_da
+CICE_IC=${BM_IC}/cpc
+
+# FV3 fixed input
+cp    @[RTPWD]/${FV3_DIR}/INPUT/aerosol.dat .
+cp    @[RTPWD]/FV3_input_bm2/INPUT/co2historicaldata_201*.txt .
+cp    @[RTPWD]/${FV3_DIR}/INPUT/sfc_emissivity_idx.txt .
+cp    @[RTPWD]/${FV3_DIR}/INPUT/solarconstant_noaa_an.txt .
+if [ $OZ_PHYS_NEW = .T. ]; then
+  cp  @[RTPWD]/${FV3_DIR}/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
+elif [ $OZ_PHYS_OLD = .T. ]; then
+  cp  @[RTPWD]/${FV3_DIR}/INPUT/global_o3prdlos.f77 .
+fi
+cp    @[RTPWD]/${FV3_DIR}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
+cp    @[RTPWD]/${FV3_DIR}/*grb .
+cp    @[RTPWD]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
+cp    @[RTPWD]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
+cp    @[RTPWD]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
+cp    @[RTPWD]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
+
+# MOM6 fixed input
+cp    @[RTPWD]/MOM6_FIX/@[OCNRES]/* ./INPUT
+
+# CICE5 fixed input
+cp    @[RTPWD]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx025.nc .
+cp    @[RTPWD]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx025.nc .
+
+# WW3 fix/input
+cp    @[RTPWD]/WW3_input_data/mod_def.* .
+cp    @[RTPWD]/WW3_input_data/${SYEAR}${SMONTH}${SDAY}/ww3_multi.inp .
+
+# ICs
+cp    @[RTPWD]/${FV3_IC}/sfc_data*.nc ./INPUT
+cp    @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
+cp    @[RTPWD]/${MOM6_IC}/MOM*.nc ./INPUT
+cp    @[RTPWD]/${CICE_IC}/cice5_model_0.25.*.nc ./cice5_model.res.nc
+
+# WARM START
+if [[ ! $MED_restart_data == '' ]]; then
+  cp  @[RTPWD]/@[MED_restart_data]/mediator_* .
+fi
+
+# CCPP
+if [[ ! $SUITE_NAME == '' ]]; then
+  cp ${PATHTR}/FV3/ccpp/suites/suite_@[SUITE_NAME].xml .
+fi