Skip to content

Commit

Permalink
Merge DeniseWorthen/feature/ultralow
Browse files Browse the repository at this point in the history
  • Loading branch information
NickSzapiro-NOAA authored Dec 16, 2024
2 parents 409bc85 + 4dc2a92 commit 1f2f0a5
Show file tree
Hide file tree
Showing 7 changed files with 836 additions and 10 deletions.
6 changes: 4 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/DeniseWorthen/fv3atm
branch = feature/ultralow
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
2 changes: 1 addition & 1 deletion FV3
16 changes: 12 additions & 4 deletions tests/fv3_conf/cpld_control_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ else
FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
elif [[ $ATMRES == C12 ]]; then
FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L41_mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
else
if [ "$V2_SFC_FILE" = "true" ]; then
FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}_v2_sfc
Expand Down Expand Up @@ -95,7 +99,9 @@ if [ $WARM_START = .false. ]; then
cp ${ICE_IC}/cice.mx@[OCNRES].${SYEAR}${SMONTH}${SDAY}${SHOUR}.warmstart.nc ./cice.warmstart.nc
else
cp ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
cp ${ICE_IC}/${OCNRES}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
####### FIXME #######
# non-valid file, just to get scripting to work; ice_in will set CICE_IC to "default" IC for now
cp ${ICE_IC}/invalid.nc ./cice_model.res.nc
fi
fi
fi
Expand Down Expand Up @@ -187,9 +193,11 @@ if [ $IAER = 1011 ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat
fi

cp @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ls* ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ss* ./INPUT
if [[ $ATMRES != C12 ]]; then
cp @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ls* ./INPUT
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ss* ./INPUT
fi

if [ $IMP_PHYSICS = 8 ]; then
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN CCN_ACTIVATE.BIN
Expand Down
646 changes: 646 additions & 0 deletions tests/parm/MOM_input_900.IN

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ case ${MACHINE_ID} in
PARTITION=c5
dprefix=${dprefix:-/gpfs/f5/${ACCNR}/scratch/${USER}}
STMP=${STMP:-${dprefix}/RT_BASELINE}
PTMP=${PTMP:-${dprefix}/RT_RUNDIRS}
PTMP=${PTMP:-${dprefix}/RT_RUNDIRS}

SCHEDULER="slurm"
;;
Expand Down Expand Up @@ -1017,7 +1017,8 @@ if [[ "${CREATE_BASELINE}" == false ]] ; then
fi
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20240501}
#INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20240501}
INPUTDATA_ROOT=/scratch2/NCEPDEV/stmp3/Denise.Worthen/input-data-20240501
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20240214
INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-${DISKNM}/NEMSfv3gfs/BM_IC-20220207}
INPUTDATA_LM4=${INPUTDATA_LM4:-${INPUTDATA_ROOT}/LM4_input_data}
Expand Down Expand Up @@ -1121,7 +1122,7 @@ if [[ ${ECFLOW} == true ]]; then
# Default maximum number of compile and run jobs
MAX_BUILDS=10 #Max build jobs
MAX_JOBS=30 #Max test/run jobs
ECF_TRIES=2 #Tries before failure
ECF_TRIES=1 #Tries before failure

# Reduce maximum number of compile jobs on jet and s4 because of licensing issues
if [[ ${MACHINE_ID} = jet ]]; then
Expand Down
2 changes: 2 additions & 0 deletions tests/rt.ultra
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_coupled_lowres -DDEBUG=ON | | fv3 |
RUN | cpld_control_c12 | | baseline |
167 changes: 167 additions & 0 deletions tests/tests/cpld_control_c12
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
#
# cpld_control_c12 test
#
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C12MX900"

export CNTL_DIR=cpld_control_c12

export LIST_FILES=" "
# export LIST_FILES="sfcf024.tile1.nc \
# sfcf024.tile2.nc \
# sfcf024.tile3.nc \
# sfcf024.tile4.nc \
# sfcf024.tile5.nc \
# sfcf024.tile6.nc \
# atmf024.tile1.nc \
# atmf024.tile2.nc \
# atmf024.tile3.nc \
# atmf024.tile4.nc \
# atmf024.tile5.nc \
# atmf024.tile6.nc \
# RESTART/20210323.060000.coupler.res \
# RESTART/20210323.060000.fv_core.res.nc \
# RESTART/20210323.060000.fv_core.res.tile1.nc \
# RESTART/20210323.060000.fv_core.res.tile2.nc \
# RESTART/20210323.060000.fv_core.res.tile3.nc \
# RESTART/20210323.060000.fv_core.res.tile4.nc \
# RESTART/20210323.060000.fv_core.res.tile5.nc \
# RESTART/20210323.060000.fv_core.res.tile6.nc \
# RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
# RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
# RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
# RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
# RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
# RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
# RESTART/20210323.060000.fv_tracer.res.tile1.nc \
# RESTART/20210323.060000.fv_tracer.res.tile2.nc \
# RESTART/20210323.060000.fv_tracer.res.tile3.nc \
# RESTART/20210323.060000.fv_tracer.res.tile4.nc \
# RESTART/20210323.060000.fv_tracer.res.tile5.nc \
# RESTART/20210323.060000.fv_tracer.res.tile6.nc \
# RESTART/20210323.060000.phy_data.tile1.nc \
# RESTART/20210323.060000.phy_data.tile2.nc \
# RESTART/20210323.060000.phy_data.tile3.nc \
# RESTART/20210323.060000.phy_data.tile4.nc \
# RESTART/20210323.060000.phy_data.tile5.nc \
# RESTART/20210323.060000.phy_data.tile6.nc \
# RESTART/20210323.060000.sfc_data.tile1.nc \
# RESTART/20210323.060000.sfc_data.tile2.nc \
# RESTART/20210323.060000.sfc_data.tile3.nc \
# RESTART/20210323.060000.sfc_data.tile4.nc \
# RESTART/20210323.060000.sfc_data.tile5.nc \
# RESTART/20210323.060000.sfc_data.tile6.nc \
# RESTART/20210323.060000.MOM.res.nc \
# RESTART/iced.2021-03-23-21600.nc \
# RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
export ATMRES=C12

export_fv3
export_cpl
export CCPP_SUITE=FV3_coupled_lowres

export RESTART_N=12
export RESTART_INTERVAL="${RESTART_N} -1"

export INPES=1
export JNPES=1
export NPZ=41
export NPZP=42
export TAU=10.
export N_SPONGE=5
export D2_BG_K2=0.0
export N_SPLIT=6
export DNATS=1

export atm_omp_num_threads=1
export WRTTASK_PER_GROUP=2

# export INPES=$INPES_cpl_c48
# export JNPES=$JNPES_cpl_c48
# export atm_omp_num_threads=$THRD_cpl_c48
# export WRTTASK_PER_GROUP=$WPG_cpl_c48
export OUTPUT_GRID='cubed_sphere_grid'

# export WAV_tasks=0
# export CHM_tasks=0
# OCN_tasks=$OCN_tasks_cpl_c48
# ICE_tasks=$ICE_tasks_cpl_c48
OCN_tasks=2
ICE_tasks=2

# atm/ocn/ice resolution
export NPX=13
export NPY=13
export IMO=192
export JMO=94

export OCNRES=900
export ICERES=9.00
export NX_GLB=40
export NY_GLB=20
export CICE_NPROC=$ICE_tasks
export CICE_DECOMP=slenderX1
export CICE_BLCKX=`expr $NX_GLB / $CICE_NPROC`
export CICE_BLCKY=$NY_GLB

# set component and coupling timesteps
export DT_ATMOS=1200
export DT_CICE=${DT_ATMOS}
export DT_DYNAM_MOM6=3600
export DT_THERM_MOM6=3600

# ufs.configure
export coupling_interval_slow_sec=${DT_THERM_MOM6}
export coupling_interval_fast_sec=${DT_ATMOS}

# resolution dependent files
export MOM6_INPUT=MOM_input_${OCNRES}.IN
export MESH_ICE=mesh.mx${OCNRES}.nc
export MESH_OCN=mesh.mx${OCNRES}.nc
export CICE_GRID=grid_cice_NEMS_mx${OCNRES}.nc
export CICE_MASK=kmtu_cice_NEMS_mx${OCNRES}.nc
export MOM6_CHLCLIM=''
export MOM6_FRUNOFF=''
export MOM6_RIVER_RUNOFF=False
export MOM6_DIAG_COORD_DEF_Z_FILE=oceanda_zgrid_25L.nc

export MOM6_INPUT=MOM_input_900.IN
export MOM6_RESTART_SETTING=n

export CICE_ICE_IC=default
export CICE_RESTART_IOTASKS=1
export CICE_HISTORY_IOTASKS=1

export FNALBC="'C12.snowfree_albedo.tileX.nc'"
export FNALBC2="'C12.facsf.tileX.nc'"
export FNTG3C="'C12.substrate_temperature.tileX.nc'"
export FNVEGC="'C12.vegetation_greenness.tileX.nc'"
export FNVETC="'C12.vegetation_type.tileX.nc'"
export FNSOTC="'C12.soil_type.tileX.nc'"
export FNSOCC="'C12.soil_color.tileX.nc'"
export FNVMNC="'C12.vegetation_greenness.tileX.nc'"
export FNVMXC="'C12.vegetation_greenness.tileX.nc'"
export FNSLPC="'C12.slope_type.tileX.nc'"
export FNABSC="'C12.maximum_snow_albedo.tileX.nc'"
export FNSMCC="'global_soilmgldas.statsgo.t92.192.94.grb'"
export FNMSKH="'global_slmask.t62.192.94.grb'"

# resolution dependent setting
export CDMBWD=${CDMBWD_c48}
export DT_INNER=${DT_ATMOS}

# no aero, no waves
export CPLCHM=.false.
export CPLWAV=.false.
export CPLWAV2ATM=.false.
export MOM6_USE_WAVES=False
export eps_imesh=1.0e0

export DIAG_TABLE=diag_table_template
export FIELD_TABLE=field_table_thompson_noaero_tke
export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN

export FV3_RUN=cpld_control_run.IN

# HR4 GFSv17 GWD update
#export DO_GWD_OPT_PSL=.true.
#export DO_GSL_DRAG_SS=.false.

0 comments on commit 1f2f0a5

Please sign in to comment.