Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy gnumake build from fv3atm and NEMS, remove legacy Python 2.7 support, rename v16beta to v16 and RT updates #384

Merged
merged 13 commits into from
Jan 29, 2021
Merged

Remove legacy gnumake build from fv3atm and NEMS, remove legacy Python 2.7 support, rename v16beta to v16 and RT updates #384

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bddffbb
Update .gitmodules and submodule pointers for fv3atm and NEMS
climbfuji Jan 19, 2021
0ead790
Remove Python 2.7 support from top-level CMakeLists.txt
climbfuji Jan 19, 2021
26d0978
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jan 28, 2021
9857056
Reduce forecast length of test fv3_ccpp_gfs_v16_RRTMGP_c192L127 from …
climbfuji Jan 28, 2021
368b212
Rename v16beta to v16 everywhere except the public release documentation
climbfuji Jan 28, 2021
205cdeb
Bugfixes and missing changes
climbfuji Jan 28, 2021
c9ac209
Remove 'export CCPP_LIB_DIR=ccpp/lib' from all regression tests
climbfuji Jan 28, 2021
a861b0c
Update regression test baseline date tag to 20210128; skip-ci
climbfuji Jan 28, 2021
66ec29e
Revert .gitmodules change for NEMS and update NEMS submodule pointer
climbfuji Jan 29, 2021
cbe3d69
Update ecflow-python environment on cheyenne and jet; skip-ci
climbfuji Jan 29, 2021
d0e52bd
Regression test logs for all tier-1 platforms except jet.intel (still…
climbfuji Jan 29, 2021
d5b6408
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jan 29, 2021
acc6d49
Regression test log for jet.intel; skip-ci
climbfuji Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
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/climbfuji/fv3atm
branch = remove_gnumake
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
8 changes: 2 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,7 @@ endif()
target_link_libraries(nemsio::nemsio INTERFACE w3emc::w3emc_d bacio::bacio_4)

# Configure Python
find_package(Python 3 QUIET COMPONENTS Interpreter)
if (NOT Python_Interpreter_FOUND)
find_package(Python 2.7 REQUIRED COMPONENTS Interpreter)
endif()
find_package(Python 3 REQUIRED COMPONENTS Interpreter)
message("Found Python: ${Python_EXECUTABLE}")

###############################################################################
Expand Down Expand Up @@ -241,8 +238,7 @@ list(APPEND _nems_srcs NEMS/src/module_NEMS_UTILS.F90
NEMS/src/module_NEMS_INTERNAL_STATE.F90
NEMS/src/module_NEMS_GRID_COMP.F90
NEMS/src/module_NEMS_Rusage.F90
NEMS/src/nems_c_rusage.c
NEMS/src/ENS_Cpl/ENS_CplComp_ESMFMod_STUB.F90)
NEMS/src/nems_c_rusage.c)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/NEMS/src/ESMFVersionDefine_ESMF_NUOPC.h
${CMAKE_CURRENT_BINARY_DIR}/NEMS/src/ESMFVersionDefine.h
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 16 files
+0 −2 ccpp/CMakeLists.txt
+0 −193 ccpp/build_ccpp.sh
+0 −71 ccpp/driver/makefile
+0 −101 ccpp/set_compilers.sh
+1 −1 ccpp/suites/suite_FV3_GFS_v16.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_flake.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_no_nsst.xml
+0 −30 conf/make.rules
+0 −66 cpl/makefile
+0 −273 gfsphysics/makefile
+0 −101 io/makefile
+0 −165 makefile
+0 −357 mkDepends.pl
+0 −54 stochastic_physics/makefile
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 134 files
2 changes: 1 addition & 1 deletion tests/fv3_conf/ccpp_gfs_v16_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ rm -fr INPUT RESTART
rsync -arv @[INPUTDATA_ROOT]/FV3_input_data/INPUT/ INPUT/
mkdir RESTART
if [ $WARM_START = .T. ]; then
rsync -arv ../fv3_ccpp_gfs_v16beta${RT_SUFFIX}/RESTART/ INPUT/
rsync -arv ../fv3_ccpp_gfs_v16${RT_SUFFIX}/RESTART/ INPUT/
cd INPUT
rename 20161004.000000. '' 20161004.000000.*
cd ..
Expand Down
2 changes: 1 addition & 1 deletion tests/fv3_conf/ccpp_regional_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rsync -arv @[INPUTDATA_ROOT]/@[INPUT_DIR]/model_configure .
rm -rf INPUT RESTART
mkdir INPUT RESTART

rsync -arv @[INPUTDATA_ROOT]/@[INPUT_DIR]/INPUT/. INPUT/.
rsync -arv @[INPUTDATA_ROOT]/fv3_regional_control/INPUT/. INPUT/.

if [ $WARM_START = .T. ]; then
cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res INPUT/coupler.res
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ccpp_v16beta_c96.nml.IN → tests/parm/ccpp_v16_c96.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
fhout = 3
fhmaxhf = 120
fhouthf = 1
ccpp_suite = 'FV3_GFS_v16beta'
ccpp_suite = 'FV3_GFS_v16'
/

&diag_manager_nml
Expand Down
0 tests/parm/ccpp_v16beta_c96_rrtmgp.nml.IN → tests/parm/ccpp_v16_c96_rrtmgp.nml.IN
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/parm/ccpp_v16beta_flake_c96.nml.IN → tests/parm/ccpp_v16_flake_c96.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
fhout = 3
fhmaxhf = 120
fhouthf = 1
ccpp_suite = 'FV3_GFS_v16beta_flake'
ccpp_suite = 'FV3_GFS_v16_flake'
/

&diag_manager_nml
Expand Down
26 changes: 13 additions & 13 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,24 @@ RUN | fv3_ccpp_thompson_no_aero
# This test crashes with NaNs on jet.intel
RUN | fv3_ccpp_rrfs_v1beta | - jet.intel | fv3 |

COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16beta_RRTMGP | | fv3 |
COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP | | fv3 |
# fv3_ccpp_gfs_v15p2 and fv3_ccpp_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
RUN | fv3_ccpp_gfs_v15p2 | - cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_restart | | | fv3_ccpp_gfs_v16beta
RUN | fv3_ccpp_gfs_v16beta_stochy | | fv3 |
RUN | fv3_ccpp_gfs_v16 | | fv3 |
RUN | fv3_ccpp_gfs_v16_restart | | | fv3_ccpp_gfs_v16
RUN | fv3_ccpp_gfs_v16_stochy | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP | - cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP | | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP | | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP_c192L127 | | fv3 |

COMPILE | SUITES=FV3_GFS_v16_csawmg | | fv3 |
# fv3_ccpp_gfsv16_csawmg crashes with a "bus error" on cheyenne.intel, turn off both tests
RUN | fv3_ccpp_gfsv16_csawmg | - cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfsv16_csawmgt | - cheyenne.intel | fv3 |

COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16beta_flake | | fv3 |
COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake | | fv3 |
RUN | fv3_ccpp_gocart_clm | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_flake | | fv3 |
RUN | fv3_ccpp_gfs_v16_flake | | fv3 |

COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf | | fv3 |
RUN | fv3_ccpp_HAFS_v0_hwrf_thompson | | fv3 |
Expand All @@ -107,11 +107,11 @@ RUN | fv3_ccpp_esg_HAFS_v0_hwrf_thompson
# Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
# Note: weird bug on Cheyenne, compiling without SUITES=... works fine on the login nodes, but crashes on the compute nodes; same issues on wcoss_cray and wcoss_dell_p3
COMPILE | DEBUG=Y | - gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
COMPILE | DEBUG=Y SUITES='FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16beta,FV3_GFS_v16beta_RRTMGP' | + gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
COMPILE | DEBUG=Y SUITES='FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP' | + gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
RUN | fv3_ccpp_gfs_v15p2_debug | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_debug | | fv3 |
RUN | fv3_ccpp_gfs_v16_debug | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP_debug | | fv3 |

COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y | | fv3 |
RUN | fv3_ccpp_gsd_debug | | fv3 |
Expand All @@ -129,7 +129,7 @@ RUN | fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug
# CPLD tests #
###################################################################################################################################################################################

COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y | - wcoss_cray gaea.intel jet.intel | fv3 |
COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_control | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_restart | - wcoss_cray gaea.intel jet.intel | | cpld_control
RUN | cpld_controlfrac | - wcoss_cray gaea.intel jet.intel | fv3 |
Expand Down Expand Up @@ -160,13 +160,13 @@ RUN | cpld_restart_bmarkfrac
RUN | cpld_bmarkfrac_v16 | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_restart_bmarkfrac_v16 | - wcoss_cray gaea.intel jet.intel | | cpld_bmarkfrac_v16

COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y WW3=Y | - wcoss_cray gaea.intel jet.intel | fv3 |
COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y WW3=Y | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_bmark_wave | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_bmarkfrac_wave | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_bmarkfrac_wave_v16 | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_control_wave | - wcoss_cray gaea.intel jet.intel | fv3 |

COMPILE | DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y | - wcoss_cray gaea.intel jet.intel | fv3 |
COMPILE | DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_debug | - wcoss_cray gaea.intel jet.intel | fv3 |
RUN | cpld_debugfrac | - wcoss_cray gaea.intel jet.intel | fv3 |

Expand Down
18 changes: 9 additions & 9 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,9 @@ elif [[ $MACHINE_ID = jet.* ]]; then
ROCOTOCOMPLETE=$(which rocotocomplete)
ROCOTO_SCHEDULER=slurm

export PATH=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.3.1/bin:$PATH
export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.3.1/lib/python2.7/site-packages
ECFLOW_START=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.3.1/bin/ecflow_start.sh
export PATH=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.5.3/bin:$PATH
export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.5.3/lib/python3.6/site-packages
ECFLOW_START=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.5.3/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))

QUEUE=batch
Expand All @@ -302,10 +302,10 @@ elif [[ $MACHINE_ID = jet.* ]]; then

elif [[ $MACHINE_ID = cheyenne.* ]]; then

module load python/2.7.16
export PATH=/glade/p/ral/jntp/tools/ecFlow-5.3.1/bin:$PATH
export PYTHONPATH=/glade/p/ral/jntp/tools/ecFlow-5.3.1/lib/python2.7/site-packages
ECFLOW_START=/glade/p/ral/jntp/tools/ecFlow-5.3.1/bin/ecflow_start.sh
module load python/3.7.9
export PATH=/glade/p/ral/jntp/tools/ecFlow-5.5.3/bin:$PATH
export PYTHONPATH=/glade/p/ral/jntp/tools/ecFlow-5.5.3/lib/python3.7/site-packages
ECFLOW_START=/glade/p/ral/jntp/tools/ecFlow-5.5.3/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))

QUEUE=regular
Expand Down Expand Up @@ -411,9 +411,9 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
fi

if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210126/${RT_COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210128/${RT_COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210126}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210128}
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210115}
Expand Down
2 changes: 1 addition & 1 deletion tests/rt_35d.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN | cpld_bmarkfrac_wave_35d
RUN | cpld_bmarkfrac_wave_35d | | fv3 | | 2013070100
RUN | cpld_bmarkfrac_wave_35d | | fv3 | | 2013100100

COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y WW3=Y | + hera.intel orion.intel | fv3 | |
COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y WW3=Y | + hera.intel orion.intel | fv3 | |
RUN | cpld_bmarkfrac_wave_v16_35d | | fv3 | | 2012010100
RUN | cpld_bmarkfrac_wave_v16_35d | | fv3 | | 2012040100
RUN | cpld_bmarkfrac_wave_v16_35d | | fv3 | | 2012070100
Expand Down
Loading