Skip to content

Commit

Permalink
NEMSfv3gfs: this commits #refs 66932, inline post
Browse files Browse the repository at this point in the history 
Change-Id: Ibaa0c3c9d5a703243908cc3fe98814443ac7123a
  • Loading branch information
@junwang-noaa
junwang-noaa committed Oct 9, 2019
1 parent 771b564 commit 3a577c0
Show file tree
Hide file tree
Showing 64 changed files with 51,674 additions and 146,821 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated from f4f864 to f85829
2 changes: 1 addition & 1 deletion NEMS
Submodule NEMS updated 19 files
+0 −6 src/conf/module-setup.csh.inc
+0 −6 src/conf/module-setup.sh.inc
+1 −1 src/incmake/buildenv.mk
+1 −14 src/incmake/confopt.mk
+6 −11 src/incmake/env/rdhpcs/detect.mk
+0 −7 src/incmake/env/rdhpcs/theia.gnu.mk
+0 −7 src/incmake/env/rdhpcs/theia.intel.mk
+0 −7 src/incmake/env/rdhpcs/theia.pgi.mk
+4 −15 tests/apps.def
+0 −2 tests/commit.def
+0 −3 tests/multi-app-test.sh
+4 −0 tests/nightly/cron/hera-nemspara.cron
+3 −0 tests/nightly/cron/hera-user.cron
+0 −16 tests/nightly/cron/theia-nemspara.cron
+0 −6 tests/nightly/cron/theia-user.cron
+1 −3 tests/nightly/nightly.def
+5 −0 tests/nightly/run-from-hera-nemspara.sh
+4 −0 tests/nightly/run-from-hera-user.sh
+5 −147 tests/rtgen
15 changes: 8 additions & 7 deletions compsets/all.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ load 'fv3.input'
run fv3_control @ fv3, standard, baseline, ccpptrans
run fv3_decomp @ fv3, standard
run fv3_2threads @ fv3, standard
run fv3_ccpp_control @ fv3, standard, ccpptrans, plat==theia.intel,plat==theia.slurm.intel,plat==hera.intel
run fv3_ccpp_control @ fv3, standard, ccpptrans, plat==hera.intel
run fv3_restart @ fv3, standard, baseline
run fv3_read_inc @ fv3, standard, baseline
run fv3_gfdlmp @ fv3, standard, baseline
run fv3_gfdlmprad @ fv3, standard, baseline, ww3, plat==theia.intel,plat==theia.slurm.intel,plat==wcoss_dell_p3,plat==wcoss.cray
run fv3_gfdlmprad @ fv3, standard, baseline, ww3, plat==wcoss_dell_p3,plat==wcoss.cray
run fv3_gfdlmprad_gwd @ fv3, standard, baseline
run fv3_gfdlmprad_noahmp @ fv3, standard, baseline
run fv3_thompson @ fv3, standard, baseline
run fv3_wsm6 @ fv3, standard, baseline
run fv3_csawmgshoc @ fv3, standard, baseline
run fv3_rasmgshoc @ fv3, standard, baseline
run fv3_csawmg @ fv3, standard, baseline
run fv3_csawmg3shoc127 @ fv3, baseline, plat==wcoss.cray,plat==theia.intel,plat==theia.slurm.intel,plat==wcoss_dell_p3,plat==hera.intel
run fv3_csawmg3shoc127 @ fv3, baseline, plat==wcoss.cray,plat==wcoss_dell_p3,plat==hera.intel
run fv3_satmedmf @ fv3, standard, baseline
run fv3_lheatstrg @ fv3, standard, baseline
run fv3_wrtGauss_netcdf_esmf @ fv3, standard, baseline
Expand All @@ -26,22 +26,23 @@ run fv3_wrtGauss_nemsio @ fv3, standard, baseline
# possibly due to an issue with the uJet nodes that have been assigned
# to SLURM. For now, that test is disabled under SLURM.

run fv3_wrtGauss_nemsio_c768 @ fv3, baseline, ww3, plat==theia.intel, plat==theia.slurm.intel, plat==xjet, plat==svjet, plat==tujet, plat==wcoss.cray
run fv3_wrtGauss_nemsio_c768 @ fv3, baseline, ww3, plat==xjet, plat==svjet, plat==tujet, plat==wcoss.cray
run fv3_wrtGauss_nemsio_c192 @ fv3, standard, baseline
run fv3_stochy @ fv3, standard, baseline
run fv3_iau @ fv3, standard, baseline

run fv3_appbuilder @ fv3, standard

run fv3_control_32bit @ fv3, standard, baseline
run fv3_gfdlmprad_32bit_post @ fv3, standard, baseline, plat==wcoss_dell_p3,plat==wcoss.cray,plat==hera.intel
run fv3_stretched @ fv3, standard, baseline
run fv3_stretched_nest @ fv3, standard, baseline
run fv3_stretched_nest_quilt @ fv3, standard, baseline, plat==theia.intel, plat==theia.slurm.intel, plat==tujet, plat==wcoss.cray, plat==wcoss_dell_p3, plat==wcoss.phase1, plat==wcoss.phase2,plat==hera.intel
run fv3_stretched_nest_quilt @ fv3, standard, baseline, plat==tujet, plat==wcoss.cray, plat==wcoss_dell_p3, plat==wcoss.phase1, plat==wcoss.phase2,plat==hera.intel

run fv3_regional_control @ fv3, standard, baseline
run fv3_regional_restart @ fv3, standard, baseline
run fv3_regional_quilt @ fv3, standard, baseline
run fv3_regional_c768 @ fv3, standard, baseline

run fv3_control_debug @ fv3, standard, plat==theia.intel, plat==theia.slurm.intel,plat==hera.intel
run fv3_stretched_nest_debug @ fv3, standard, plat==theia.intel, plat==theia.slurm.intel,plat==hera.intel
run fv3_control_debug @ fv3, standard, plat==hera.intel
run fv3_stretched_nest_debug @ fv3, standard, plat==hera.intel
100 changes: 98 additions & 2 deletions compsets/fv3.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ embed bash compile.sh(MAKE_OPTS=' ',BUILD_NR='',fv3,modules,md5) [[[
./compile.sh "@[plat%HOMEnems]/FV3" \
$( echo @[plat%MACHINE_ID] | sed 's,\.,_,g' ) \
@[MAKE_OPTS] @[BUILD_NR]
elif [[ @[plat%PLATFORM_NAME] == hera* || @[plat%PLATFORM_NAME] == theia* || @[plat%PLATFORM_NAME] == cheyenne* || @[plat%PLATFORM_NAME] == gaea* || @[plat%PLATFORM_NAME] == jet* ]] ; then
# Don't substitute the . with a _ on Theia/Cheyenne
elif [[ @[plat%PLATFORM_NAME] == hera* || @[plat%PLATFORM_NAME] == cheyenne* || @[plat%PLATFORM_NAME] == gaea* || @[plat%PLATFORM_NAME] == jet* ]] ; then
# Don't substitute the . with a _ on Cheyenne
echo "DON'T SUBSTITUTE _ for . on @[plat%PLATFORM_NAME]"
./compile.sh "@[plat%HOMEnems]/FV3" \
@[plat%MACHINE_ID] \
Expand Down Expand Up @@ -238,6 +238,8 @@ fv3_defaults = {
NFHOUT_HF='1'

QUILTING='.true.'
OUTPUT_HISTORY='.true.'
WRITE_DOPOST='.false.'
WRITE_GROUP=1
NUM_FILES=2
FILENAME_BASE="'dyn' 'phy'"
Expand Down Expand Up @@ -1976,6 +1978,100 @@ test fv3_control_32bit: fv3_32bit.exe {

}

########################################################################
test fv3_gfdlmprad_32bit_post: fv3_32bit.exe {
use fv3_gfdlmp

TEST_DESCR="Compare FV3 GFDL mircrophysics radiation change with inline post results with previous trunk version"
CNTL_NAME='fv3_gfdlmprad_32bit_post'

LGFDLMPRAD='.true.'
EFFR_IN='.true.'
WRITE_DOPOST='.true.'

build=fv3_32bit.exe

COM="@[plat%COMrt]/@[TEST_NAME]" # Test result area
RUNDIR="@[plat%TMPrt]/@[TEST_NAME]" # Test work area
CNTL="@[plat%BASELINE]/@[CNTL_NAME]" # Control baseline area

prep=fv3_prep(
RUNDIR="@[RUNDIR]",modules="@[fv3_32bit.exe%modules.nems]",
CNTL="@[CNTL]")

# Specify input files.
filters input {
# WORK FILE <=filter= SOURCE FILE
'input.nml' <=atparse= "@[PARMnems]/gfdlmp.nml.IN"
'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
'itag' <=atparse= "@[PARMnems]/post_itag"
'postxconfig-NT.txt' <=atparse= "@[PARMnems]/postxconfig-NT.txt"
'params_grib2_tbl_new' <=atparse= "@[PARMnems]/params_grib2_tbl_new"
'aerosol.dat' <=copyfrom= "@[FV3_input_data]/INPUT"
'co2historicaldata_201*.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'sfc_emissivity_idx.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'solarconstant_noaa_an.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'*grb' <=copyfrom= "@[FV3_input_data]"
'*_table' <=copyfrom= "@[FV3_input_data]"
'diag_table' <=copy= "@[FV3_input_data]/diag_table_gfdlmp"
'field_table' <=copy= "@[FV3_input_data]/field_table_gfdlmp"
'*configure' <=copyfrom= "@[FV3_input_data]"
'INPUT' <=copy= "@[FV3_input_data]/INPUT"
'global_o3prdlos.f77' <=copy= "@[FV3_input_data]/INPUT/global_o3prdlos.f77"
}

# Specify output files:
criteria output {
# WORKFILE
'atmos_4xdaily.tile1.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile2.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile3.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile4.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile5.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile6.nc' .bitcmp. "@[CNTL]"
'phyf000.nemsio' .bitcmp. "@[CNTL]"
'phyf024.nemsio' .bitcmp. "@[CNTL]"
'dynf000.nemsio' .bitcmp. "@[CNTL]"
'dynf024.nemsio' .bitcmp. "@[CNTL]"
'GFSPRS.GrbF00' .bitcmp. "@[CNTL]"
'GFSPRS.GrbF24' .bitcmp. "@[CNTL]"
'RESTART/coupler.res' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"

}

}

########################################################################
#
test fv3_iau: fv3.exe {
Expand Down
5 changes: 2 additions & 3 deletions compsets/platforms.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,12 @@ platform.defaults={
load 'wcoss.input'
load 'jet.input'
load 'gaea.input'
load 'theia.input'
load 'hera.input'

########################################################################

# Autodetection of available platforms. Calls the "detect" function
# from each of the listed platforms.

autodetect plat (/ gaea.c3, gaea.c4, wcoss.cray, theia.intel, wcoss.phase2, wcoss.phase1,
xjet, svjet, tujet, wcoss_dell_p3, ujet.slurm, theia.slurm.intel, hera.intel /)
autodetect plat (/ gaea.c3, gaea.c4, wcoss.cray, wcoss.phase2, wcoss.phase1,
xjet, svjet, tujet, wcoss_dell_p3, ujet.slurm, hera.intel /)
Loading

0 comments on commit 3a577c0

Please sign in to comment.