-
Notifications
You must be signed in to change notification settings - Fork 247
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.
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
Merge NOAA-GSL gsl/develop into develop, update all GSL regression tests to use new GFS v16 C96L127 ICs, update macOS build config #937
Conversation
Implementation of RUC LSM ice model in CCPP * Squash-merge climbfuji:rucice_gfsv16dzmin into gsl/develop * Add kice=9 to tests/tests/fv3_ccpp_rap and tests/tests/fv3_ccpp_hrrr * Change NEW_BASELINE directory for gsl/develop to avoid conflicts with development work on the authoritative branches * Add KICE=9 to tests/tests/fv3_ccpp_gsd_unified_ugwp and tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp * Revert change to .gitmodules and update submodule pointer for fv3atm Co-authored-by: Dom Heinzeller <[email protected]>
* Updates to stochastic_physics_wrapper (ufs-community#280) Fix to stochastic_physics_wrapper to allow for random patterns to update at a longer time-step than model Co-authored-by: Dom Heinzeller <[email protected]> * Update for Jet, bug fixes in running with frac_grid=T and GFDL MP, and in restarting with frac_grid=T (ufs-community#304) Update the modulefile for jet.intel to enable UPP v10.0.0. The hpc-stack v1.0.0 pre-release is used for this. Small changes are made to tests.rt.sh for jet.intel and gaea.intel (consistency with other platforms). The submodule pointer update for fv3atm addresses bugs in the ufs-weather-model with frac_grid=T and GFDL microphysics, and with restarting the model when frac_grid=T (from @shansun6 and @SMoorthi-emc). * Feature/update mom6 and retain b4b results for 025x025 resolution (ufs-community#290) * point MOM6 to new branch which corresponding to GFDL 20201022 commit * modify fms_files.cmake and mom6_files.cmake to reflect changes in MOM6 code as this version of MOM6 contains some file deletion, new files being added and renaming of files * manually set MOM6 parameters in order to retain origonal results for 0.25x0.25 resolution * update MOM6 to include Bugfix for mom6solo to be built * modify compile.sh to allow mom6solo compiling * modify MOM_input_template for all resolutions based on GFDL MOM6-example main branch update on 20201022 * change executable permissions for CMakeLists.txt * chmod 644 to 6 files Dom pointed out * chmod for CMakeLists.txt and tests/compile.sh * change baseline directpory to 20201202 in rt.sh * Update CICE, Move regression test input outside baseline directory (ufs-community#270) *Updates CICE to most recent develop branch of NOAA-EMC * Sets n_aero (number of aerosols) in ice_in_template to 0. * removes trailing whitespace from ice_in * moves regression test input outside baseline directory (ufs-weather PR ufs-community#312) Co-authored-by: Dusan Jovic <[email protected]> Co-authored-by: Dom Heinzeller <[email protected]> * Revert change to .gitmodules and update submodule pointer for fv3atm Co-authored-by: Phil Pegion <[email protected]> Co-authored-by: jiandewang <[email protected]> Co-authored-by: Denise Worthen <[email protected]> Co-authored-by: Dusan Jovic <[email protected]>
…er updates and bugfixes (ufs-community#52)
…fs-community#55) Code is identical to original/current code in the authoritative repository (NOAA-PSD, branch master)
* Add regression tests with stochastic land perturbations for suites FV3_GSD_v0 and FV3_GSD_noah Co-authored-by: Dom Heinzeller <[email protected]>
…perturbed variables (ufs-community#61) * Updates to regression tests fv3_ccpp_gsd_lndp and fv3_ccpp_gsd_noah_lndp * Bug fix for tests/parm/ccpp_gsd_sar.nml.IN
* Updates to stochastic_physics_wrapper (ufs-community#280) Fix to stochastic_physics_wrapper to allow for random patterns to update at a longer time-step than model Co-authored-by: Dom Heinzeller <[email protected]> * Update for Jet, bug fixes in running with frac_grid=T and GFDL MP, and in restarting with frac_grid=T (ufs-community#304) Update the modulefile for jet.intel to enable UPP v10.0.0. The hpc-stack v1.0.0 pre-release is used for this. Small changes are made to tests.rt.sh for jet.intel and gaea.intel (consistency with other platforms). The submodule pointer update for fv3atm addresses bugs in the ufs-weather-model with frac_grid=T and GFDL microphysics, and with restarting the model when frac_grid=T (from @shansun6 and @SMoorthi-emc). * Feature/update mom6 and retain b4b results for 025x025 resolution (ufs-community#290) * point MOM6 to new branch which corresponding to GFDL 20201022 commit * modify fms_files.cmake and mom6_files.cmake to reflect changes in MOM6 code as this version of MOM6 contains some file deletion, new files being added and renaming of files * manually set MOM6 parameters in order to retain origonal results for 0.25x0.25 resolution * update MOM6 to include Bugfix for mom6solo to be built * modify compile.sh to allow mom6solo compiling * modify MOM_input_template for all resolutions based on GFDL MOM6-example main branch update on 20201022 * change executable permissions for CMakeLists.txt * chmod 644 to 6 files Dom pointed out * chmod for CMakeLists.txt and tests/compile.sh * change baseline directpory to 20201202 in rt.sh * Update CICE, Move regression test input outside baseline directory (ufs-community#270) *Updates CICE to most recent develop branch of NOAA-EMC * Sets n_aero (number of aerosols) in ice_in_template to 0. * removes trailing whitespace from ice_in * moves regression test input outside baseline directory (ufs-weather PR ufs-community#312) Co-authored-by: Dusan Jovic <[email protected]> Co-authored-by: Dom Heinzeller <[email protected]> * Updates to build for JEDI linking/control, add wcoss2 (ufs-community#295) * Build on wcoss2 (acorn) * Use -march=core-avx2 instead of -xCORE-AVX2 on wcoss2 * Updates to build for JEDI linking/control * Removed unnecessary include files and INLINE POST setting * Updated to address PR suggestions. * Add rt_acorn.conf. Change /lfs/h2 to /lfs/h1. * Update .gitmodules and submodule pointer for fv3atm for code review and testing * regression test results * Updated .gitmodules and removed extraneous file * Fixed .gitmodules and updated pointer for FV3 * Updated pointer to NEMS repo Co-authored-by: Dusan Jovic <[email protected]> Co-authored-by: Dom Heinzeller <[email protected]> * Final-final GFS v16 updates / restart reproducibility bugfixes (ufs-community#325) * Update .gitmodules and submodule pointer for fv3atm for code review and testing * Add GFS v16 beta restart test, update stochastics test * Update regression test baseline date tag to 20201214; skip-ci * tests/rt.conf: bugfix, add missing 'fv3' to new stochy tests; skip-ci * Regression test logs for gaea.intel, hera.gnu, hera.intel, jet.intel, orion.intel; skip-ci * Run GFS v16beta tests also on wcoss; regression test logs for wcoss; skip-ci * Regression test logs for cheyenne.intel and cheyenne.gnu * Revert change to .gitmodules and update submodule pointer for fv3atm * Add optional bulk flux calculation in ufs-datm (ufs-community#266) * Update NEMS DATM and CMEPS to allow the optional bulk flux formulation; add two tests using the option * Update top level CMakeList.txt to have compile flags for MOM6 and CICE6 identical for ufs-cpld and ufs-datm * Add optional configuration variable to nems.configure to specify the directory where CMEPS will write restarts * Adds cheyenne tasking variables to default_vars and sets WW3_COMP to cheyenne for platform cheyenne.intel *NOTE: Baselines develop-20201215 exist on all platforms, regression tests were run against exactly that baseline on all systems except cheyenne.intel. On cheyenne.intel the tests were run against 20201214, and this baseline is identical to 20201215 (as per "diff -r develop-20201214 develop-20201215"). Co-authors: @DusanJovic-NOAA @aerorahul @JessicaMeixner-NOAA skip-ci * Add 2 new tests for DATM-MOM6-CICE6 application (ufs-community#332) * Add the following 2 tests: datm_restart_cfsr, datm_debug_cfsr * Add wcoss_dell_p3.log. * Add Hera log, Orion log, wcoss_dell_p3 log. * RRTMGP and Thompson MP coupling (ufs-community#323) * Feature branch with RRTMGP and Thompson MP * Updated FV3/ccpp-physics. Added namelist and configuration for RRTMGP RTs using GSD physics. * Updated FV3 * Update physics in FV3 * Updated baselines in rt.sh * Updated RT logs. Updated FV3 physics submodule pointer. * Updated FV3 hash and .gitmodules * Regression test log for PR ufs-community#323 for jet.intel (ufs-community#336) * Update modules with hpc-stack v1.1.0 (ufs-community#319) * Update modules with hpc-stack v1.1.0 * Minor bug fixes to CCPP UGWP Co-authored-by: Dom Heinzeller <[email protected]> * Replace old regional SDF with FV3_GFS_v15_thompson_mynn (ufs-community#333) * Replace old FV3_GFS_2017_gfdlmp_regional SDF for regional tests with FV3_GFS_v15_thompson_mynn. * Final path to IC's and new results. Also, input.nml updated. * Update RegressionTests_wcoss_dell_p3.log * Update RegressionTests_wcoss_cray.log * Update RegressionTests_hera.intel.log * Update RegressionTests_jet.intel.log * Update RegressionTests_orion.intel.log * Update RegressionTests_cheyenne* logs. * Update RegressionTests_hera.gnu.log * Feature/ww3update (ufs-community#334) This updates the WW3 submodule pointer to point to the top of the WW3 develop branch. The path to WW3 inputs is changed to input-data-20201201/WW3_input_data_20201207/ * Remove IPD (step 1) (ufs-community#331) Make CCPP=Y the default in tests/compile.sh. Remove CCPP=Y from tests/rt*.conf and adjust formatting. Update submodule pointer for MOM6 to include PR ufs-community#341 ("Update MOM6 to GFDL's 20201218 commit") Add modulefiles/wcoss_cray/fv3_debug (identical to modulefiles/wcoss_cray/fv3) Fix broken utest (see ufs-community#348) * Update the format of rt.conf (ufs-community#349) Update the format of MACHINES column in rt.conf (and other .conf files). This column can be either empty, which means a test will run on all supported machines, or start with - or + sign to exclude or include specified machines explicitly. * Add checkpoint restarts for ufs-cpld (ufs-community#342) * Adds 3 checkpoint restart tests for the ufs-cpld model * Drops the existing c92mx025 restart test * Adds cheyenne.intel as tested configuration for ufs-cpld and ufs-datm * Fixes instances of srf_data* in various fv3_conf files * add frac grid input, update and add additional cpld tests (ufs-community#354) * Updates FV3_input_frac to add both benchmark dates and L127 files * Adds additional tests and restart tests for coupled model * Sets all cpld tests to use frac grid input by default * Removes all instances of USE_LA_LI2016=True except for benchmark+wave configurations * Remove unnecessary SIMD instruction sets for Jet, first round of cleanup in rt.conf, initialize cld_amt to zero for regional runs (dycore) (ufs-community#353) * Reduce SIMDMULTIARCH sets from four to two in cmake/Intel.cmake * First cleanup of regression test config tests/rt.conf * tests/rt.sh: reduce number of build jobs on jet.intel from 10 to 5 * Remove flags -f and -s from rt.sh, remove SET logic, remove corresponding column in all rt*conf files * Remove tests/rt_acorn.conf and run GFS v15p2 and GFS v16beta DEBUG tests on all platforms * Implementation of CCPP timestep_init and timestep_final phases (ufs-community#337) * Update .gitmodules and submodule pointer for fv3atm for code review and testing * Update submodule pointer for fv3atm; skip-ci * Don't try to compile all suites in DEBUG mode on cheyenne.intel, weird bug on compute nodes; skip-ci * Don't try to compile all suites in DEBUG mode on wcoss_cray; skip-ci * Regression test logs for cheyenne.gnu, cheyenne.intel, gaea.intel, hera.gnu, hera.intel, jet.intel, orion.intel; skip-ci * Don't try to compile all suites in DEBUG mode on wcoss_dell_p3; skip-ci * Regression test logs for wcoss_cray and wcoss_dell_p3 * Revert change to .gitmodules and update submodule pointer for fv3atm * Update CMEPS (ufs-community#345) * Update CMEPS for recent changes, including addition of new run "post" run phases to eliminate redundant mapping, multiple ice sheet capability and ocn->land ice dynamic mapping * Add a new test fv3_gfs_v16_RRTMGP_c192L127 Co-authored-by: Jun Wang <[email protected]> * Remove IPD steps 3 and 5 (ufs-community#357) Reduce SIMDMULTIARCH sets from four to two in cmake/Intel.cmake * First cleanup of regression test config tests/rt.conf * tests/rt.sh: reduce number of build jobs on jet.intel from 10 to 5; skip-ci * Remove flags -f and -s from rt.sh, remove SET logic, remove corresponding column in all rt*conf files * Update usage in rt.sh, add modulefiles/jet.intel/fv3_debug; skip-ci * CCPP is default in cmake build * Add debug modulefiles for linux.gnu and macosx.gnu * Update submodule pointer for fv3atm * Change logic in CMakeLists.txt and tests/compile.sh so that 32BIT=ON automatically sets DYN32=ON; skip-ci * Move logic to set DYN32 - depending on 32BIT setting - to fv3atm * Remove -DCCPP=ON from tests/compile.sh; update submodule pointer for fv3atm; skip-ci * point fv3 to EMC develop branch (ufs-community#377) * update cpl gfsv16 tests, rrtmgp fix and bug fixes in cmeps (ufs-community#378) * update CMEPS, fix character length error for gnu compile * add Dusan's fix for rt_utils.sh * update cpl gfsv16 tests, replace seaice_newland.grb with global_slmask.t1534.3072.1536.grb, recover input.mom6.nml.IN, update input directory, update global thread and decomp tests, update fdiag for global control * point to Dustins rrtmgp fix branch * update input directory Co-authored-by: denise.worthen <[email protected]> Co-authored-by: Jun Wang <[email protected]> * Update develop from NOAA-GSL: RUC ice, MYNN sfclay, stochastic land perturbations (ufs-community#386) * Update .gitmodules and submodule pointer for fv3atm for gsl/develop branch * RUC ice for gsl/develop (replaces ufs-community#47) (ufs-community#49)Implementation of RUC LSM ice model in CCPP * Squash-merge climbfuji:rucice_gfsv16dzmin into gsl/develop * Add kice=9 to tests/tests/fv3_ccpp_rap and tests/tests/fv3_ccpp_hrrr * Change NEW_BASELINE directory for gsl/develop to avoid conflicts with development work on the authoritative branches * Add KICE=9 to tests/tests/fv3_ccpp_gsd_unified_ugwp and tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp * Revert change to .gitmodules and update submodule pointer for fv3atm * Update gsl/develop from develop 2020/12/08 (ufs-community#50) * Updates to stochastic_physics_wrapper (ufs-community#280) Fix to stochastic_physics_wrapper to allow for random patterns to update at a longer time-step than model * Update for Jet, bug fixes in running with frac_grid=T and GFDL MP, and in restarting with frac_grid=T (ufs-community#304) Update the modulefile for jet.intel to enable UPP v10.0.0. The hpc-stack v1.0.0 pre-release is used for this. Small changes are made to tests.rt.sh for jet.intel and gaea.intel (consistency with other platforms). The submodule pointer update for fv3atm addresses bugs in the ufs-weather-model with frac_grid=T and GFDL microphysics, and with restarting the model when frac_grid=T (from @shansun6 and @SMoorthi-emc). * Land stochastic perturbations (ufs-community#57) * dycore options to add zero-gradient BC to reconstruct interface u/v and change dz_min as input (ufs-community#369) * Update fv3atm * update ccpp control test forecast length to 24h * remove rename command * Add CI related changes * Update RT logs * Update RT log files * Add the gaea RT log file * Update the point of fv3atm * Update fv3atm Co-authored-by: Jun Wang <[email protected]> Co-authored-by: MinsukJi-NOAA <[email protected]> Co-authored-by: Jun Wang <[email protected]> * MOM6 bugfixes, GFDL update, update CDMBGWD settings; fix for restart reproducibility (without waves) when USE_LA_LI2016=True, sign error on fprec passed to ocean, GFDL update, resolution dependent cdmbgwd settings (ufs-community#379) * implements two MOM6 bugfixes in the NUOPC MOM6 cap to allow restart reproducibility when USE_LA_LI2016=True and to change the sign of the latent heat flux associated with frozen precipitation (fprec) exported to MOM6 * updates MOM6 to include the GFDL 20210120 main branch which contains EMC's wave coupling code, alone with some minor code standardization and documentation * updates the cdmbgwd namelist settings for FV3 standalone tests at C96 and implements resolution dependent values for ufs-cpld tests Co-authored-by: Ali <[email protected]> * Remove legacy gnumake build from fv3atm and NEMS, remove legacy Python 2.7 support, rename v16beta to v16 and RT updates (ufs-community#384) * Update .gitmodules and submodule pointers for fv3atm and NEMS * Remove Python 2.7 support from top-level CMakeLists.txt * Reduce forecast length of test fv3_ccpp_gfs_v16_RRTMGP_c192L127 from 24h to 12h * Rename v16beta to v16 everywhere except the public release documentation * Bugfixes and missing changes * Remove 'export CCPP_LIB_DIR=ccpp/lib' from all regression tests * Update regression test baseline date tag to 20210128; skip-ci * Update ecflow-python environment on cheyenne and jet; skip-ci * Update CMEPS for HAFS integration; add datm and coupled-model tests on Gaea (ufs-community#401) * Add HAFS support in NOAA-EMC/CMEPS * Add coupled and datm tests for Gaea.intel Co-authored-by: Jun Wang <[email protected]> Co-authored-by: Bin Li <[email protected]> * Move LSM vegetation lookup tables into CCPP, clean up RUC snow cover on ice initialization (remove IPD step 2) (ufs-community#407) * Regression test logs for all tier=1 platforms * updates FMS to 2020.04.01 (ufs-community#392) * updates FMS to 2020.04.01 * fixes fms_files.cmake * removes extra horiz_interp * Workaround for FMS 2020.04.01 for Cheyenne with GNU 9.1.0, incl. regression test log Co-authored-by: Mikyung Lee <[email protected]> Co-authored-by: Dom Heinzeller <[email protected]> * add optional mesh in MOM6; add dz_min and min_seaice as configurable variables for coupled model (ufs-community#399) *Implements an optional setting in the cpld and datm nems.configure files to specify whether the MOM6 cap should use a mesh or a grid *Adds configurable settings for min_seaice to gfs_physics_nml and dz_min to fv_core_nml. * UGWP v0 v1 combined (ufs-community#396) - combines the changes in PRs ufs-community#360 and ufs-community#382 - adds three regression tests `fv3_ccpp_gfsv16_ugwpv1 `, `fv3_ccpp_gfsv16_ugwpv1_warmstart` and `fv3_ccpp_gfsv16_ugwpv1_debug` - contains updates and bugfixes for `nc_compare.py` and the CI tests from @MinsukJi-NOAA - update Python3 environment on jet.intel, gaea.intel, cheyenne.{intel,gnu} - turn off (again) test `fv3_ccpp_decomp` on jet.intel, this test didn't work in the past, but recently it "passed", because the error checking with `nc_compare.py` failed silently and we didn't notice it Co-authored-by: valery.yudin <[email protected]> Co-authored-by: Michael Toy <[email protected]> Co-authored-by: MinsukJi-NOAA <[email protected]> * Update regression tests from GFSv15+Thompson to GFSv16+Thompson, include "Add one regional regression test in DEBUG mode. (ufs-community#419)" (ufs-community#421) * Add one regional regression test in DEBUG mode. * Update .gitmodules and submodule pointer for fv3atm for code review and testing * Update regression tests from GFSv15+Thompson to GFSv16+Thompson * Combine several COMPILE lines in tests/rt.conf and tests/rt_gnu.conf * Regression test log for cheyenne.{gnu,intel},gaea.intel, hera.gnu, jet.intel,hera.intel,orion.intel;wcoss_cray and wcoss_dell_p3; Co-authored-by: Phil Pegion <[email protected]> Co-authored-by: jiandewang <[email protected]> Co-authored-by: Denise Worthen <[email protected]> Co-authored-by: Dusan Jovic <[email protected]> Co-authored-by: Mark Potts <[email protected]> Co-authored-by: BinLi-NOAA <[email protected]> Co-authored-by: dustinswales <[email protected]> Co-authored-by: Kyle Gerheiser <[email protected]> Co-authored-by: RatkoVasic-NOAA <[email protected]> Co-authored-by: Ali.Abdolali <[email protected]> Co-authored-by: Jun Wang <[email protected]> Co-authored-by: Jun Wang <[email protected]> Co-authored-by: XiaqiongZhou-NOAA <[email protected]> Co-authored-by: Ali <[email protected]> Co-authored-by: Bin Li <[email protected]> Co-authored-by: MiKyung Lee <[email protected]> Co-authored-by: valery.yudin <[email protected]> Co-authored-by: Michael Toy <[email protected]> Co-authored-by: MinsukJi-NOAA <[email protected]>
…ufs-community#64) * Update submodule pointer for fv3atm
…community#65) * Update submodule pointer for fv3atm * Copy new Thompson tables from temporary location
…_from_master_20210316 Update gsl/develop from develop 20210316
…m/SamuelTrahanNOAA/ufs-weather-model into feature/per-timestep-pgr-like-wrf
…fv3atm for code review and testing
…r-model into update_gsl_develop_from_develop_20210331
… and stochastic_physics
…_from_develop_20210331 Update gsl/develop from develop 2021/03/31
…v3_gsd_diag3d_debug
Turn on the printout of the WRF noise parameter for regression test fv3_gsd_diag3d_debug
Automated RT Failure Notification |
….com/climbfuji/ufs-weather-model into update_gsl_global_and_regional_tests
Hash for fv3atm is correct (e7687f4), ready to merge |
PR Checklist
Ths PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model wiki if you are unsure how to do this.
This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR
An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
are specified below.
Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.
New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.
Description
This PR is a major overhaul of the regression tests employing the physics developed at NOAA-GSL. The new control for these suites is now
rap_control
to move away from institutional names. Based on this new control, the analog to the operational requirements tests are added for decomposition, threading, restart etc. Feature tests are added that swap out individual physics one at a time. Most tests are created in DEBUG mode and run only for 1h to speed up the testing.This PR requires new input data and new baselines. The current C96L127
gfs_data.tile?.nc
files in the input data need to be replaced with files that contain the Thompson aerosol climatology, but are otherwise identical. This has no impact on model runs that do not use Thompson aerosol-aware microphysics. All new tests use C96L127 instead of the old C96L64 input data. However, I think that there are still some tests (HAFS) that use the old input data, therefore it cannot be removed yet.The submodule pointer updates for fv3atm and ccpp-physics contain several updates and bugfixes for RAP physics and uite definition files, including a sign error for UGWP, bug fixes in Thompson MP when using the inner loop, updates to RUC LSM, GF convection, MYNN PBL/SFC.
New baselines required. The following tests change results due to updates to the RAP physics (Thompson, UGWP, ...):
All old GSL tests are removed:
New tests are:
For follow-up work, see #953.
New input data
New input data set input-data-20211210 is available on the following machines
Issue(s) addressed
Fixes #952
Fixes #703
Testing
Regression tests were run regularly on Hera with Intel and GNU to make sure that only the results that were expected to change do change. Full regression tests will be run on all tier-1 platforms at the time of commit.
rt.conf
)Dependencies