Draft: Merge latest RUC LSM into community develop #161
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update AERO_ExtData.rc for new fengsha dust input * Brings the regression tests closer to the p8c target configuration. Changes include: - Updating fractional clay and sand to the SOILGRIDSv2 data - REF: https://soil.copernicus.org/articles/7/217/2021/ - Silt isn't actually used in the scheme. Set to /dev/null:0.0 to skip reading a file and instead fill with zeros - SSM is no longer used as the albedo drag partition describes the same information to the scheme. Set to /dev/null:1.0 so that all values are unity - `DU_RDRAG` now uses a three year climatology of the Chappel and Webb 2016 albedo drag partition derived from the latest 3 years of MODIS BRDF Albedo monthly averages - `DU_UTHRES` now uses a more robust threshold velocity derived from known historical dust point observations using a data driven approach from the combination of a met reanalysis, SOILGRIDSv2, and a RandomForest ensemble * Update alpha to be consistent with latest scaling - This updates the `alpha` parameter to be consistent with the latest dust code changes and inputs - Note that gamma here doesn't matter because the `ssm=1` now in the `AERO_ExtData.rc` file * Add FSCAV_AERO for regression tests - Adds the environment vairable FSCAV_AERO so that the wet scavaging coeffients are not by default set to zero ensuring that the convective parameterizations are fully tested when aerosols are used.
* Update wcoss2 modulefiles * Update regression test to run on wcoss2 (cactus and dogwood) * Use 4 threads for c768 tests on hera
* update intel compiler to intel2022 * remove I_MPI_DAPL_UD fot Intel 2022/2021 * update libraries g2 (3.4.5), Jasper (2.0.25), PIO (2.5.3), libpng (1.6.37)
… 32-bit physics support (ufs-community#1227) * Changes to ccpp to support 32-bit physics in NRL Neptune model * Turn on HAFS RTs on WCOSS2 and switch to use the netcdf (instead of netcdf_parallel) write_grid_component option for HAFS RTs. * Use fms/2022.01 on wcoss_cray. * Turn this hafs_regional_storm_following_1nest_atm test back on for hera.intel. * Coordinate changes for AQM Co-authored-by: samuel.trahan <[email protected]> Co-authored-by: Jianping.Huang <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
… configuration (ufs-community#1218) * set new nstf default and remove from restart tests * fix DOGP_LWSCAT variable for coupled tests * create p8 version of atmaero test * add parsing of diag table for atmaero case * bmark ICs do not contain nsst spinup; restart test uses the default NSTF_NAME=2,0,0,0,0 * turn cpld_decomp_p8 test back on for jet.intel * turn off atmaero_control_p8 test on cheyenne.intel
* update submodules * updating submodules * update submodules * update submodules * revert some changes in rt scripts for testing * delete some untracked files * add test for prognostic area fraction * update submodules * update submodules * fetch upstream and merge * update stochastic physics submodule * update stochastic physics submodule * update stochastic_physics submodule * update sumbodules * update submodules * update submodules * correction in progsigma test * update submodules * removing wclosureflg * allow CA to use non-uniform blocksizes * update FV3 submodule * add test control_p8_progsigma * update logfile * update stochastic_physics submodule * update submodules * updating submodules * updating FV3 submodule * removing some untracked files * removing some untracked files * chaning back some test and compile scripts * updating CDEPS submodule * merging with CDEPS update * updating submodules * merge upstream * merge upstream * merge upstream * merge with updates to CMEPS-interface * update CMEPS submodule * update FV3 submodule * updates FV3 and ccpp/physics submodules * regression tests * new field_table with prognostic area fraction * new RT for progsigma at c384 * add new prognostic area fraction tests * add new test * delete previous test * update FV3 submodule * updated FV3 submodule * update latest CICE submodule * update new test to include the latest changes made to develop branch * update meta data and intent for conditional variables * Update log file * Correct baseline pointer in newly generated RT test * log file * log file * updating rt.conf after merging * update test from cpld_control_c384_p8_progsigma to control_c384_progsigma * Merge submodule fv3atm upstream * merge with fv3atm develop * update test to use default_vars instead of creating a new namelist * update sumbodule pointer to WW3 * Update ORT to work for c384 dcp tests * clean up .gitmodules * log file * [AutoRT] cheyenne.gnu Job Completed. on-behalf-of @ufs-community <[email protected]> * [AutoRT] cheyenne.intel Job Completed. on-behalf-of @ufs-community <[email protected]> * [AutoRT] orion.intel Job Completed. on-behalf-of @ufs-community <[email protected]> * add wcoss_cray_log * [AutoRT] hera.intel Job Completed. on-behalf-of @ufs-community <[email protected]> * add wcoss2 log * add wcoss_dell_p3 log * [AutoRT] gaea.intel Job Completed. on-behalf-of @ufs-community <[email protected]> * add jet log * [AutoRT] hera.gnu Job Completed. on-behalf-of @ufs-community <[email protected]> * update fv3atm submodule pointer, and revert .gitmodules Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: Denise.Worthen <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
… EARTH_GRID_COMP to UFSDriver (ufs-community#1239) * Require specific package version in top-level CMakeLists.txt * Rename EARTH_GRID_COMP to UFSDriver * Update s4 support (NOAA-GSL#31) * Updated S4 compiler versions ufs-community#1223 * Single dt output (NOAA-GSL#30)
* add exchange grid support * add RT for exchange grid implementation * update CMEPS for CCPP host model definition * update FV3 * update CMEPS to fix the data atmosphere configurations * update CMEPS to fix area issue and fix suite names in the build, FV3 to allocate data structures conditionally * update mediator to configure CCPP options * update cmeps and rename new xgrid test * update to support new naming convention for mediator provided fluxes * update CMEPS to bring restart to CCPP host model and make build conditional * fix mediator ccpp host to restart xgrid configuration * add documentation for exchange grid configuration
* 20220505 Jesse Meng new branch upp_unify_inline_2d built from * 20220525 Jesse Meng update upp * 20220613 Jesse Meng update FV3 hash
… temperatures (ufs-community#1266) * typo caused potential temperature calculation to use exponentiation instead of multiplication * new BL_DATE: 20220613
…orter rap&hrrr forecast lengths. (ufs-community#1257) * Temporarily add tests/rt_rap_decomp.conf * Enable test regional_spp_sppt_shum_skeb GNU, increase wallclock time to 30 minutes * Revert changes to test regional_spp_sppt_shum_skeb, remove from rt_gnu.conf * Add cpld control noaero nowave test to rt_gnu.conf for CI on AWS * Add compilation test of moninshoc.meta * Modify cpld_control_run.IN to conditionally copy wave restart file. * add all variants of rap_control and hrrr_control tests * Reduce rap&hrrr test runtime from 24 hours to 12 hours * Change cpld_control_c96_noaero_p8 to cpld_control_nowave_noaero_p8 * Add noaero & nowave_noaero tests (3 of them) to rt.conf * add regional_3km_decomp test * use noaaemc docker hub account instead of MInsukJi's personal account for input data
… different than ocean/ice grid ufs-community#1279, Update rt.conf to compile all suites with Intel in debug mode ufs-community#1230 (ufs-community#1256) * add new files in mom6_files.cmake * point to mapwav branch for CMEPS * all tests using cmeps (s2s, hafs, cdeps) pass on cheyenne.intel * point MOM6 and CMEPS to latest code
…munity#1265) * Remove 'calendar:' parameter from all model_configure templates By default the calendar type will be 'gregorian' * Remove executable flag from params_grib2_tbl_new and two field_tables
…ufs-community#1273) (ufs-community#1291) * adjust atmaero_resources *add default atmaero resources add test on cheyenne
…ecksum option and performance with (1,1) io layout in FV3 (ufs-community#1294) * Remove WCOSS Cray and Dell support from regression tests * Remove two unnecessary COMPILE steps for DEBUG ATM tests * Update FV3 submodule (combining this PR with ufs-community#1275)
* change for mynn opt_sfc in NoahMP * update ccpp-physics repository * update fv3 repository * Update rap.nml.IN * set opt_sfc=4 for 4 rrfs_v1* tests
…sics (ufs-community#1192) * Added coupling of GOCART aerosols with radiation * Added a regression test named rad_grt_atm_aerosols into rt.conf * Updated FV3 to include additions of total flux calculation for wet deposition in the Thompson scheme * Removed unused file tests/tests/rad_grt_atm_aerosols * Updated FV3 for adding a switch to the Thompson scheme in physics * Updated FV3 for fixing a bug in mp_thompson.F90
…on info to wiki; Update P8 sfc ICs for FV3; Update WW3_inputdata directory; Bug fix for ufs-community#1309: false reports of test failures (ufs-community#1292) *add documentation for generating wave model meshes * set wave domain explicitly * all baselines pass if retain mx025 for bmark_p8 * switch glo_30m to gwes_30m * switch bmark_p8 test to use gwes_30m domain * update WW3 input directory * update WW3 input directory for oRT script * switch mesh_wave for the 35d test * switch sfc input for FV3BMIC to p8c directory * Bug fix for ufs-community#1309: false reports of test failures
…atology dataset in RTs (ufs-community#1311) * Updated the lheatstrg and dt_inner settings for RTs, deleted FV3_GFS_v16_flake in rt.conf * Modified a few p8 related tests * Deleted 6 RTs related to control_thompson * Updated P8 and HAFS RTs with the new ice climatology dataset * set cheyenne TPN=18: atmaero_control_p8 cpld_control_noaero_p8 cpld_control_nowave_noaero_p8 cpld_control_p8
…ule to fix in-line post issues for RRFS and HAFS (ufs-community#1298)
* New CCPP_32BIT option for 32-bit slow physics. Requires 32BIT=ON to enable. * Revise ccpp-physics changes to pass 64-bit gnu regression tests (intel not yet tested) * Use double precision for stochastic_physics noise generator. * FV3/ccpp/physics: Clean up machine.F and get rid of kind_evod & kind_rad * bug fixes: 12hr forecasts, 45 min wallclock, io changes only for CCPP_32BIT * remove dead_compile bug from rt.sh * add 32-bit tests to rt.conf and rt_gnu.conf * Reduce 32-bit test forecast lengths and revert to 30 minute wallclock limits * LHEATSTRG=.false. in 32-bit tests & 24-hour forecats in rap * 12hr forecast length for rap_control_dyn64_phy32
* update CICE for Cgrid * update CICE with change of F->S * add settings for ice grid options * add GRIDICE, GRIDOCN, GRIDATM to ice_in_template and default vars to specify possible component grid options * add C-grid test for cpld_control_p8
…andidate) (2) add temperature limiter in SPPT (ufs-community#1302) * pointing MOM6 to test branch add 3 new files in cmake list * add temperature limiter for SPPT in MOM6
… test (was ufs-community#1336) (ufs-community#1287) * * Update CDEPS * Update the following tests: datm_cdeps_bulk_gefs datm_cdeps_control_gefs datm_cdeps_control_gefs datm_cdeps_iau_gefs datm_cdeps_mx025_gefs datm_cdeps_stochy_gefs * Add coupled c48-5deg ocean+ice tests.
* Enable regression testing on Acorn * Updated RT variables for S4. ufs-community#1318 (NOAA-GSL#34) * Feature/allow wavice cmeps (NOAA-GSL#33) * update CMEPS * add fields needed by cmeps for wave-ice coupling * remove blank lines from ciceC test
…ototype 8, and turn on prognostic closure. (ufs-community#1480) * Generation of gfsv17 tests for RT's beyond P8, updates in FV3 and ccpp submodules * Added DNATS=0 flag to not exclude any tracers from advection * update TKE contribution from cu for progsigma in deep and shallow cu * Correct noareo tests to set DNATS=0 to ensure advection of all tracers * Address review comments - clean out P7 and P8 labels in GFSv17 tests * update rt.conf removing old control tests, adding a cpld gfsv17 test * add outerloop wave coupling to a gfsv17 test * remove duplicate test Co-authored-by: Jessica Meixner <[email protected]> Co-authored-by: jkbk2004 <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
* adding hr_ave_chem_v1 * aqm diag_table changes Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: JONG KIM <[email protected]>
* removed control_2dwrtdecomp, control_fhzero, control_2threads_debug
…unity#1514) * Update Jenkinsfile * Update ci.test * add a mixed-mode test Co-authored-by: zach1221 <[email protected]> Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Rahul Mahajan <[email protected]> Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
…munity#1518) * Performance optimization of moving nest. * Turn on HAFS RTs on WCOSS2 and switch to use the netcdf (instead of netcdf_parallel) write_grid_component option for HAFS RTs. * Update submodule FV3, which points to latest UPP develop branch. * Update submodule FV3, which will only call atmosphere_fill_nest_cpl at the cap driver time steps (coupling time steps) * Adding upoff as a namelist parameter * Update submodule HYCOM after the momentum flux fix for HAFS FV3ATM-HYCOM coupling. * Update submodule FV3 and rename HAFS_V0 CCPP physics suites into HAFS_V1. * Cleanup of CMakefile for moving nest, and added fv_timers namelist option Co-authored-by: William Ramstrom <[email protected]> Co-authored-by: Biju Thomas <[email protected]> Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
… indices. (ufs-community#1497) * fv3 surface restart io: turn some calls into loops * turn many loops into subroutine calls, and remove nt_save * Refactor surface restart logic in FV3GFS_io.F90 to not use hard-coded indices Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
* Enhanced stability of drag_suite module and added diagnostics * Added new UGWP diagnostic variables to parm/diag_table/diag_table_rap * Bug fixes to rap, hrrr and rrfs test description files and tests/parm/rap.nml.IN * Updated standard_names for do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd and ugwp_seq_update * Incorporated dustinswales suggestions in ccpp-physics PR#22 * Assumed-shape in gwdps.f * Added logical flag 'ugwp_seq_update' to gfs_physics_nml namelist * Modified calculation of dtfac in drag_suite.F90 and revised various long_name's of diagnostic variables * Removed passage of variables 'ak' and 'bk' to drag_suite -- these are no longer used * Removed unused variables from GFS_typedefs.F90 and added clarifying comments in ccpp-physics Co-authored-by: JONG KIM <[email protected]>
…nity#1523) * Convert all regression tests to use esmf-managed threading * update CMakeLists.txt * update rt.conf * Comment out unneeded steps in workflows/aux.yml * turn off control_c384 on cheyenne: all others passed Co-authored-by: Bin.Li <[email protected]> Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
…mmunity#1535) * allow option no updated sub-components * Run control_c384 and control_c384gdas tests on Gaea using TPN=18 Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
* clean up gitaction yml * Update build_test.yml, aux.yml
* fix fd_nems.yaml * cmeps restart will appear as different because field names changes * set TPN=18 on cheyenne: cpld_control_c192_p8, cpld_restart_c192_p8, hafs_global_multiple_4nests_atm Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
* MYNNsfc uniform real kind Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
…y#1560) * Updated FV3 hash, Bring in Fengsha and Pt Source input files, bring in updated aqm.rc Co-authored-by: Raffaele Montuoro <[email protected]>
…ade (ufs-community#1554) * SUPAFAST option sets build flags ideal for HAFS * add test for HAFS with -DSUPAFAST=ON * SUPAFAST=>TEST_FASTER_INTEL and add -no-ip to CMAKE_Fortran_FLAGS_RELEASE * TEST_FASTER_INTEL => FASTER * Update rt_single function in rt.sh to parse correct .conf file * Remove fail_test file after model run only if Rocoto is used * Use -xSSE4.2 on GAEA * turn off regional_atmaq_debug on gaea: time limit Co-authored-by: Dusan Jovic <[email protected]> Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: JONG KIM <[email protected]>
…dates (ufs-community#1544) * Update submodule FV3/upp and use a newer version of g2tmpl/1.10.2. * Update submodule FV3 and switch to use the unified ugwp scheme for HAFS regression tests. * Update submodule HYCOM-interface/HYCOM and HYCOM-interface/CMakeLists.txt so that the debug build options will work properly for the HYCOM subcomponent. * Update tests/parm/postxconfig-NT-hafs.txt by using FV3/upp/parm/postxconfig-NT-hafs_nosat.txt * Fixed bug in calculation of nest halo weights identified by Biju Thomas in DDEBUG=ON builds. Co-authored-by: William Ramstrom <[email protected]> Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
* Remove -xHOST from CICE CMakeLists.txt. ufs-community#1262 Co-authored-by: [David Huber] <[[email protected]]> Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
* reverting the bug fix for ktherm=2 allows all cpld tests to pass and the single datm test using ktherm=2 (datm_cdeps_gfs) to also pass all other datm tests which use ktherm=1 fail Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
…ufs-community#1566) * adding regional control back to jenkins-ci (NOAA-GSL#37) * Create ESMF field attributes using the same kind as field data values Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: jkbk2004 <[email protected]>
* AutoRT update for Jenkins.
…ommunity#1582) * Bug fix for cloud effective radius for convective clouds (HR1)
* update CMEPS
* RRTMGP refactoring * Added RRTMGP p8 coupled RT. Update other GP RTs. * Adding GP physics blocking to UFS GP RT configurations * Trim old RRTMGP RTs * Interface changes for SP build in GP Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
* hpc stack internal location changes and ORT fix Co-authored-by: JONG KIM <[email protected]>
… (3) hafs bug fix (ufs-community#1606) * updates for movingnest debug mode * add hafs_regional_storm_following_1nest_atm_ocn_debug test * point MOM6 to test branch * remove cpld_esmfthreads_p8 Co-authored-by: Jun Wang <[email protected]> Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: zach1221 <[email protected]>
…OAH and NOAH MP LSM, and rename nsradar_reset (ufs-community#1529) * Six new winter wx diags, new precip ice density for RUC, NOAH MP and NOAH LSMs, new namelist parameter for nsradar_reset, new flat files for GFS and fv3lam to properly handle new winter wx diags. * remove six winter wx diags from f00 xml file * Remove commented out lines related to old computation of precip ice density * Added 6 winter weather diagnostics + precip ice density (all 2D fields) to select diag_tables * Use correct postxconfig files * Include Grant's winter wx mods Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: zach1221 <[email protected]>
…ces and turning off output; update FAQ documentation (was 1608); update drag suite intent mods (was 1612) (ufs-community#1597) * update cdeps * use fv3atm from PR 1612 * Changed UGWP diagnostic variable declaration intents from out to inout * Docs/faqupdate (ufs-community#8) Co-authored-by: Denise Worthen <[email protected]> Co-authored-by: jkbk2004 <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
* MOM6 writes restarts in YYYYMMDD.HHMMSS.MOM*nc format * the final restart is timestamped * make changes in scripts to remove 'suffix-hours' strings * remove STORE_CORIOLIS from MOM_input templates * add timestamp in the end forecast restart filenames for GFS * FV3atm restart filename format
* Update FV3 * Merge pull request NOAA-GSL#67 from dustinswales/accumulated_cleanup * Updated physics * Reverting DISKNM/gaea to original * add new BL_DATE
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Checklist
This 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.
Instructions: All subsequent sections of text should be filled in as appropriate.
The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.
Description
This PR merges changes from RRFS_dev to UFS community develop related to:
Provide a detailed description of what this PR does. What bug does it fix, or what feature does it add? Is a change of answers expected from this PR? Are any library updates included in this PR (modulefiles etc.)?
Issue(s) addressed
Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues must always be created before starting work on a PR branch!)
Testing
How were these changes tested? What compilers / HPCs was it tested with? Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)
Dependencies
(NOAA-GSL/fv3atm#163)
(NOAA-GSL/ccpp-physics#169)
If testing this branch requires non-default branches in other repositories, list them. Those branches should have matching names (ideally).
Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs