Merge upstream develop #1
Closed
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
* Added python with netcdf to RT on S4. (#842) * remove files related to datm tests and clean up scripts CDEPS points to a recently updated version Co-authored-by: David Huber <[email protected]>
…e/* updated for RTS (#870) * move field_table to tests/parm/field_table directory * changed initial profile values for tracers in parm/field_table/* * removed obsoleted if-test in tests/fv3_conf/hafs_regional_run.IN * modify tests/parm/field_table/field_table_GOCART to force initialize all chemistry tracers to zero for a cold start Co-authored-by: Jun Wang <[email protected]> Co-authored-by: Brian Curtis <[email protected]> Co-authored-by: denise.worthen <[email protected]>
…the land and ice emissivity in the routine setemis in CCPP (#821) * Update of fv3atm submodule * Update to regression test setup for correctly setting cplice for coupled and uncoupled runs Co-authored-by: Dom Heinzeller <[email protected]> Co-authored-by: Jun Wang <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
… for CCPP variables and metadata, port model to XSEDE Expanse, switch WW3 from develop to dev/ufs-weather-model (#850) This PR updates the submodule pointers for fv3atm (GFDL_atmos_cubed_sphere, ccpp-framework, ccpp-physics) and stochastic_physics for the changes described in detail in the associated PRs below: It also ports the model to the XSede Expanse system (contributed by @MinsukJi-NOAA). Switch WW3 from develop to dev/ufs-weather-model (i.e. pull #850 into this PR). This changes the results (metadata) for two regression tests, see #850 for more information. No change to input data. Also: bug fix in run_compile.sh, replace UNIT_TEST with OPNREQ_TEST. The bug fixes for issue #883 change the results of all regression tests using RUC LSM. Co-authored-by: MinsukJi-NOAA <[email protected]> Co-authored-by: aliabdolali <[email protected]> Co-authored-by: [email protected] <[email protected]>
…N options on (#714) * Update input.nml for the MULTI_GASES RT, add the MOLECULAR_DIFFUSION option * Add a WAM regresstion test with MULTI_GASES and MOLECULAR_DIFFUSION on * Update UPP lib to 10.0.10 * Update intel compiler to 18.0.5.274 Co-authored-by: Wen Meng <[email protected]> Co-authored-by: Dusan Jovic <[email protected]>
…ion (#863) * add semi-lagrangian control namelist variables to configuration, set default values for semi-Lagrangian sedimentation of rain in Thompson MP * add nw2_tracers.F90 in MOM6 cmake file * change to FHMAX=12 in fv3_gsd for identical results in the RT test, change fv3_gsd to compare 12hour outputs Co-authored-by: jiandewang <[email protected]>
…ression tests, set ECF_TRIES to 2, update Cheyenne job submission scripts; contains "Reduce memory required by MERRA2 option; fix diag_tables for P7 tests; adds C384 P7 tests to Cheyenne.intel" (#866), contains "Update CMEPS" (#775) (#831) - Remove unused/broken HAFS-HWRF regression tests that used Ferrier-Aligo MP, and updates the old HAFS-HWRF regression tests to use Noah MP instead of Noah-WRFv4. - An update in rt.sh that uses the automatic rerun capability for ecflow - Code updates to reduce memory required by MERRA2 option; fix diag_tables for P7 tests; adds C384 P7 tests to Cheyenne.intel - CMEPS update - Update Cheyenne job submission scripts due to a recent change on Cheyenne Co-authored-by: denise.worthen <[email protected]> Co-authored-by: Dusan Jovic <[email protected]>
…and global nesting RTs as well as two HAFS WW3 coupling RTs (#846) * * Add the following HAFS regional and global nesting regression tests. - hafs_regional_1nest_atm - hafs_regional_telescopic_2nests_atm - hafs_global_1nest_atm - hafs_global_multiple_4nests_atm * Unify and simplify the existing HAFS regression tests for both scripts and input data. * Switch to use 'netcdf' instead of 'netcdf_parallel' for the sfcfhhh.nc files for the hafs_regional_1nest_atm RT to speed up the write grid component. * *Add FHCYC, FHSWR, and FHLWR in tests/parm/input_global/regional/nest_hafs.nml.IN. Change FHCYC from 24 to 0 for hafs RTs. * *Add two HAFS WW3 related regression tests. - hafs_regional_atm_wav: two-way atm-wav coupling - hafs_regional_atm_ocn_wav: two-way atm-ocn coupling and one-way atm2wav coupling * updated hafs/ww3 tests -- rt.sh points to the temporary update input directories on orion Co-authored-by: JessicaMeixner-NOAA <[email protected]>
…ate WW3 to use CPP instead of switches (was #880) (#868) updates NEMS to clean up the setting of Attributes and allow coupled executable to run as standalone ATM updates WW3 to allow use of CPP ifdefs instead of the WW3 switch fortran pre-processor Co-authored-by: @JessicaMeixner-NOAA
…effective radii computation from Thompson MP" and "Fix/improve logic for convective transportable tracers, add GFS_checktracer debugging routine, correct spelling "janic" --> "janjic", fix inconsistent types related with noahmp and log functions", "Modify opnReqTest related scripts for fv3_gsd test" (#892) * Update submodule pointers for fv3atm and ccpp-physics for the changes described in the associated PRs below: fix/improve logic for convective transportable tracers in CCPP, add GFS_checktracer debugging routine, correct spelling "janic" --> "janjic" in several CCPP standard names. * remove support for the optional attribute in the CCPP framework and metadata, remove invalid optional and intent attributes from host model metadata (variable or type definitions), remove unused code for calculating cloud effective radii from Thompson MP wrapper (this is done in the radiation interstitials) * Modify opnReqTest related scripts for fv3_gsd test * Update .github/pull_request_template.md Co-authored-by: Denise Worthen <[email protected]> Co-authored-by: MinsukJi-NOAA <[email protected]>
…1.0 (#886) * reduce fhmax for coupled_control_c192_p7 test and associated restart test * update esmf to 8.2.0 and mapl to 2.11.0 Co-authored-by: Dusan Jovic <[email protected]>
* Add HAFS, HYCOM and CDEPS_DOCN documentation Co-authored-by: Bin Liu <[email protected]> Co-authored-by: Hyun-Sook Kim <[email protected]> Co-authored-by: Ufuk Turuncoglu <[email protected]>
…e schemes (#858) This PR introduces positive-definite Total Variation Diminishing (TVD) mass-flux methods recently developed at NOAA/EMC (Jongil Han) to improve tracer transport in EDMF-TKE PBL schemes and SAMF cumulus convective parameterizations. Such methods do not generate negative values for tracer mixing ratios during convective transport. The updated code may still generate very small (1.E-15) negative values during PBL mixing.
…physics only if allocated; ccpp-physics: cleanup CCPP cmake flags part 1 (#897) * Changes from CCPP/physics and fv3atm: - Fix duplicate symbols and undefined symbols errors on macOS - Register diagnostics from stochastic physics only if allocated in fv3atm -Updates the submodule pointer for ccpp-physics for the changes described in Cleanup CCPP cmake flags part 1, remove extra logic that reduces optimization for radiation_aerosols.f, update CODEOWNERS, update README.md NCAR/ccpp-physics#773 - Update top-level README.md in ccpp-physics * Set ECF_TRIES to 1 on WCOSS systems in ufs-weather-model
* updates coupled P7 test suite to include waves * updates WW3 for a fix to the MPI reproducibility issue, adds mpi tests at c96 and c384 bmark configurations * updates WW3 with fixes required for debug mode (not yet implemented) * updates WW3 to use a smaller number of spectral points for 1deg grid * updates WW3 grid files to allow MOM6 wave coupling * adds c96 control/restart for test restart reproducibility w/o waves Authors: @JessicaMeixner-NOAA @aliabdolali @MatthewMasarik-NOAA
read MERRA2 data for two months instead of 12 months and read in the data in interpolation when needed.
#910) * Updates CICE cap for optional features * Adds UPP as a FV3atm submodule * Adds 35d RT test Co-authored-by: Dusan Jovic <[email protected]> Co-authored-by: Minsuk Ji <[email protected]>
…namelist variables (#923) * add semi-lagrangian sedimentation of graupel and update the namelist variables to control semi-lagrangian sedimentation * update fv3atm
…CCPP metadata in fv3atm and ccpp-physics, use Python 3.6+ (#907) With the metadata parser update in NCAR/ccpp-framework#415, a stricter checking of units will be enforced. This includes the replacement of "convenience units" such as log(Pa) with 1. Corresponding changes are made in ccpp-physics and fv3atm. The ccpp-framework update requires Python 3.6 or newer - load Python 3.7.9 modules on Cheyenne, all other platforms are already using 3.6 or newer.
* Fixed regional regression tests wrt restart. Additionally renamed and corrected regional tests. * Fixed the issue of the accumulation bucket FHZERO impacting resulting forecast.
* modification for additional land outputs
…el and set up C768 atm-only test (#921) * The input data directory was cleaned up. * The diag_tables used by the RT tests are moved to tests/parm/diag_table. The diag_tables and field_tables under the input data directory are removed. The date in several diag_tables used by global control and related tests are corrected from 2016100300 to the new IC 2021032206. The diag_table for regional_qulit related tests are updated to be consistent with regional_control. * A high resolution C768 atmosphere only test and a lat/lon control tests were created. * net lw flux issues was fixed in fv3 and ccpp physics. Co-authored-by: Dom Heinzeller <[email protected]>
* Add P7 regression tests with RRTMGP enabled * Turn of RRTMGP tests on Cheyenne w/ Intel, turn off test control_csawmg_debug on Jet w/ Intel Co-authored-by: Dom Heinzeller <[email protected]>
Includes code changes described in NCAR/ccpp-physics#795 and NOAA-EMC/fv3atm#432: the addition of a new cloud fraction scheme for Thompson MP.
…sts to use new GFS v16 C96L127 ICs, update macOS build config (#937) *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. Update .gitmodules and submodule pointer for fv3atm for gsl/develop branch
…o include emergency bugfix for restart runs (#943) * Changes in CMake config required by the cleanup of the CCPP cmake cleanup in fv3atm, ccpp-framework, ccpp-physics * Update submodule pointer for stochastic_physics
Updates CICE for the latest Consortium main. See CICE Issue #44 for a list of updates included. In particular, this PR will update the icepack submodule to include a fix which allows -init=snan,arrays to be used in debug mode.
…ature/ort addition. (#931) * Add UFS driver, a copy of two fortran files from the NEMS repository. Remove NEMS submodule. * Update CMEPS for current escomp/master. Implement the ability to write mediator history files for ATM on tiles rather than mesh * Update CDEPS component. The updated CDEPS includes code updates for GFS v16 data mode. * Operation requirement test (ORT) for: - cpld_control_p7 thread and decomposition tests - cpld_bmark_p7 thread and decomposition tests - Due to the wave component in these tests, restart and debug do not work Co-authored-by: Minsuk Ji <[email protected]> Co-authored-by: Denise Worthen <[email protected]> Co-authored-by: BinLi-NOAA <[email protected]>
FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies.
- CCPP Physics changes: see Wrapper for ccpp-physics #806, #807, #813, NOAA-EMC/fv3atm#447. - UFS weather model changes for ORT updates following changes in Fix Auto-RT on Gaea, Jet and Orion #965
…NoahMP tsurf bugfix) (#971) * update submodule pointer for regression testing for ccpp-physics #808,816: roughness length over ice and NoahMP tsurf bugfix * Reduce time step from 600s to 450s for tests control_csawmg and control_csawmg_debug Co-authored-by: Dom Heinzeller <[email protected]> Co-authored-by: climbfuji <[email protected]>
* Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver. * Fix model_configure file for two tests to define `fhrot` parameter.
Revert/cleanup iovr=4 in RRTMG per developer's request. The current exponential cloud overlapping method used in RRTMG represents the method used in the pre-2018 operational HWRF model.
* Fhzero ORT applies to the two tests `control` and `control_p7` * Test can be run by invoking, for example, `./opnReqTest -n control -c fhz`
…ly.conf and update MOM6 to main branch (20211220) (#976) * add a new cdeps test using GFS data mode * update rt_weekly.conf to include cpld_bmark_p7_35d tests * update MOM6 Co-authored-by: jiandewang <[email protected]>
…les from ccpp-physics CMakeLists.txt (#947) *adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended).
Update upp submodule in fv3atm with latest UPP version for outputting foundation temperature and fixing land-sea mask issue in global inline post.
* Bug fixes for running on jet or with rocoto 1. Correctly detect Jet when deciding build job runtimes 2. Do not delete out and err files in compile & test jobs 3. Correct dependencies for WW3 in Rocoto 4. Do not hard-code ACCNR to h-nems This PR also contains fv3/ccpp physics (CCPP PR#812) updates that implements a vertically-integrated formula to properly compute tracer column mass and ensure mass conservation for all tracers except TKE. See issue NCAR/ccpp-physics#811 for details
*This PR turns on the rap_restart tests. Bit-for-bit reproducibility is achieved with the bug fixes for MYNN sfclay in the associated fv3atm and ccpp-physics PRs.
…site and z0ice value change (#996)
…nal HRRR (#986) This PR implements a feature of the operational HRRR, radar-derived microphysics temperature tendencies applied in the first N minutes of the forecast to improve clouds in the first few hours. Two regression tests are added.
…st suite to initial P8 configuration; (#944) * add updates for suites, tests for initial P8 configuration * add IOPT_SFC=3 as default; set IOPT_SFC=1 in p7 tests * change min_seaice to 1e-6; set to 1e-11 in p7 tests * set dddmp=0.1 in both P7 and P8. This matches the final P7 configuration. It will change P7 baselines. * set cdmbwd in both P7 and P8 to the final P7 configuration. (1.0,2.2,1.0,1.0) for all resolutions. It will change P7 baselines. * add dusan's ecflow fix for wcoss2 * update FV3 with Moorthis' snod fix * update rt_weekly to use p8 tests * change integration length to 5 days
* improves cloud fraction when using Thompson MP. See NCAR/ccpp-physics#809 for more details.
…r schemes and Corrected S4 template regression testing job card (#995) * Added a new regression test for HAFS. * Fixed the S4 RT template job card. Co-authored-by: David Huber <[email protected]> Co-authored-by: Bin Liu <[email protected]>
…hompson MP (#1000) This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml.
…ies that are no longer needed by other tests (#1008)
* Add fhz ort to cpld tests * Set ACCNR in rt.sh, not detect_machine.sh. Add some comments explaining where the variable should not be set or used. Co-authored-by: Samuel Trahan <[email protected]>
* Unify write_netcdf and write_netcdf_parallel modules. * Add support for writing 'cubed_sphere_grid' history files in a single netcdf file.
…mework and physics (#1013) * updates the submodule pointers for fv3atm, ccpp-framework and ccpp-physics for: Change standard name and unit of CCPP error flag variable in CCPP framework and physics.
Add code updates to enable the ESMF managed threading in UFS. Co-authored-by: Gerhard Theurich <[email protected] >
* sync with ww3 develop branch
* This PR addresses part 2 of issue #748 to activate the exponential-random cloud overlap method (iovr=5) in RRTMG. RT tests were added for iovr=4 and iovr=5 options * change iovr to use the environment variable in control.nml.IN; modify all tests that use control.nml.IN to set env. var. iovr=3 (except for new tests); remove restart files from new tests
…ecision in stochastic physics (#1028) - The 2D decomposition is enabled on write grid component. - FV3atm PR NOAA-EMC/fv3atm#468 from @MicroTed - stochastic physics PR NOAA-PSL/stochastic_physics#53 from Dom. Co-authored-by: Ted Mansell <[email protected]> Co-authored-by: Dom Heinzeller <[email protected]>
* add run phases to allow waves to run in the slow loop * re-order hafs wave test * update aliases in fd_nems.yaml * update CMEPS to prevent advertise conflicts when s2sw is still using connectors * add correct masking variables to hafs nems.configure files
…(combined) (#1037) Co-authored-by: @SMoorthi-emc
* Update the version of ESMF library to 8.2.1b04 * Add the write group lon info for upp 2d decomposition test.
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
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.
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
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
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