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.

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

generalization of number of soil layers #31

Open
wants to merge 144 commits into
base: nsoil9
Choose a base branch
from
Open

generalization of number of soil layers #31

wants to merge 144 commits into from

Conversation

HelinWei-NOAA
Copy link
Owner

Description

Input data additions/changes

  • No changes are expected to input data.
  • Changes are expected to input data:
    • New input data.
    • Updated input data.

Anticipated changes to regression tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:

Subcomponents involved:

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

Library Updates/Changes

  • Not Needed
  • Create separate issue in JCSDA/spack-stack asking for update to library. Include library name, library version.
  • Add issue link from JCSDA/spack-stack following this item

Combined with PR's (If Applicable):

Commit Queue Checklist:

  • Link PR's from all sub-components involved in section below
  • Confirm reviews completed in ALL sub-component PR's
  • Add all appropriate labels to this PR.
  • Run full RT suite on either Hera/Cheyenne AND attach log to a PR comment.
  • Add list of any failed regression tests to "Anticipated changes to regression tests" section.

Linked PR's and Issues:

Testing Day 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.
  • Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.

Testing Log (for CM's):

  • RDHPCS
    • Hera
    • Orion
    • Jet
    • Gaea
    • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

AnningCheng-NOAA and others added 16 commits July 24, 2023 13:11
…(branch Maie) (ufs-community#1815)

* establish maie

* optimized the code and decrease the stratosphere warm bias for mraerosol=T

* Update detect_machine.sh

* Update compile.sh

---------

Co-authored-by: Grant Firl <[email protected]>
Co-authored-by: Anning Cheng <[email protected]>
Co-authored-by: Rahul Mahajan <[email protected]>
Co-authored-by: Wen Meng <[email protected]>
* Add new BL_DATE

Update inline post with:

*Clean up legacy code in inline post interface

*Relocate computation of diagnostic variables

*Sync changes from offline post interface

*Update upp revision
* Update empty_output_bundle

* Update pull_request_template.md from 1813

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: Dusan Jovic <[email protected]>
* Update control_CubedSphereGrid_parallel test

* The control_CubedSphereGrid_parallel test has been updated to run post
and create native grid history files
* 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

* update CICE

* change freq in for ice_diag.d global values

* remove unused history* settings

* update DISKNM with epic and rt log

* Update bl.py for new Hera blstore
* add gridtype to gocart CAP.rc

* move to GOCART 20230227 version with threading capability

* udpate to netcdf/4.9.2 and add threading capability for gocart

* update esmf library

* update GOCART to allow no-Nitrates run
…r CMEPS (ufs-community#1807)

* commit changes for sensible heat flux

* add sensible heat changes

* update submodules and fd for evap fields

* backup to pre-evap changes to test
…s-community#1864)

* modify mom6_files.cmake to reflect files being removed/added
* update FV3 submodule pointer after GT combined his physics PRs
@HelinWei-NOAA HelinWei-NOAA changed the title soil layer depth is given via namelist generalization of number of soil layers Aug 21, 2023
@HelinWei-NOAA HelinWei-NOAA requested a review from barlage August 21, 2023 19:31
SamuelTrahanNOAA and others added 12 commits August 22, 2023 10:57
…ng PR#1863) (ufs-community#1844)

* Changes to logging and initialization of the CLM Lake Model.
* merge ccpp-physics ufs-community#91 (UFS-SRW v3.0.0 SciDoc updates)

1. Use ice thickness hice(i) to find the level in the lake where ice is
   zero.
2. Do not allow lake temperature to be below freezing point if there is
   no ice.
3. If there is no snow or ice, do not allow surface lake temperature to
   be below freezing point.
   These changes fixed the problem with large errors in the energy budget
   at the beginning of the cold-start run with lakes.
4. Added flag to turn on debug print statements in the CLM lake model.

* explicitly turn of frac_ice for flake

* t_grnd(i) should be t_grnd(c)
-------------------------------------------------------------------
Co-authored-by: Samuel Trahan <[email protected]>
Co-authored-by: Grant Firl <[email protected]>
…ity#1707)

*Modulefiles to be updated through this PR include: Acorn, Gaea, Hera, Jet, Linux, MacOSX, Orion, NOAA Cloud (Parallelworks), and S4 to spack-stack 1.4.1.

*Update Cheyenne's fv3_conf files to address switch from mpt to impi, 

* Update hdf5 version in ufs_common; 

* Update ufs_common, ufs_orion.intel; cherry-pick GOCART parm file and hash updates from Jun's newmapl branch.
* update CMEPS w/ fix for error condition

update cmeps build to implement check4nans feature using module stored in cdeps repo

* make pio rearranger=box the default for all tests

* update configurations for ocnalb changes

* set the ocean albedo limit in config and use it to set logical
flag
* albdir and albdif can be set as non-std values in nems.configure
will default to 0.07 and 0.06 if not set

* ocean albedo changes were merged at ESCOMP

* fix variable name in 2 nems.configure files

* update CMEPs with fioi_swpen fix

* remove albedo limiter for DATM cases
… & FV3_HRRR_gf (ufs-community#1880)

* replacement 13km conus regtests

* delete old conus13km tests

* temporary file with list of new tests

* fix errors in new compile lines

* simplify test specifications for hrrr and conus13km

* bug fix to quilt servers & use clm lake in hrrr c3 & gf

* correct errors in rt.conf for new tests

* revert bug fix to avoid a GFDL_atmos_cubed_sphere PR

* missing a "+ hera cheyenne" for one new test
…bining PRs ufs-community#1853 & 1834) (ufs-community#1467)

* Update fms to 2022.04. Update acorn modulefiles

* Remove fms_io_nml and mpp_io_nml namelists from input.nml templates

* Update FMS to 2023.01

* Use netcdf4 fms2_io option

* replace tabs with spaces

* Update rt.sh to allow creating new baselines only for a subset of tests

* Update rt.sh to run compile tasks only if needed during baseline creation (-b option)

* Revert MAX_BUILDS back to 10

* Fix hrrr qutlting restart tests.
* update module file

* update rt.conf with pdlib tests on wcoss2
…1870)

* 2D advection of cellular automata

* add Configuration.rst change from 1804

* add Glossary.rst change from 1804

* Delete doc/UsersGuide/build/.gitignore
…fs-community#1823)

* add fv3atm/mom6/cice6 run time info

* update fv3 and cice

* fix mom6 output

* use Denises cice6 branch and fix atm log file

* using stdout for mom6 timing info

* update mom6 runtime

* update CICE and mom6 output log file

* remove icepack_zsalinity.F90
* add stochastic parameterization perturbations to support to Grell-Freitas deep convection

* fix reproducibility issue in G-F deep convection
jiandewang and others added 30 commits April 25, 2024 14:52
* UFSWM - 
  * MOM6 - update MOM6 to its main repo. 20240401 commit (NCAR-candidate-20240319)
* UFSWM - fix fully coupled land component configuration
  * NOAHMP - get fixed information from surface file
…community#2221)

* NWFA Induced evaporation is turn off , but evaporation not related to aerosol is turned on to prevent excessive evaporation when Inner loop and mraerosol=T

* ccpp/framework hash update

* Cleanup unused code and variables, fix wcoss2 issue starting ecflow

* Bring in @DusanJovic-NOAA trap changes

* Merge some machine ecflow starts together and move to case statements
…fs-community#2235)

* UFSWM - update input data directory to fix CICE grid files for incorrect Bu angle, update C48 coupled warmstart files and remove 4-deg ocean files
…ion to specify fv3atm history and inline post files output directory ufs-community#2254 + Bump jinja2 from 3.1.3 to 3.1.4 in /doc/UsersGuide ufs-community#2270 (ufs-community#2215)

* UFSWM - Add several aliases in `fd_ufs.yaml` needed for JEDI-UFS. Add new model_configure option (fv3atm_output_dir) to specify directory in which all fv3atm history and inline post files will be saved.
 * FV3 -  Add new model_configure option (fv3atm_output_dir) to specify directory in which all history and inline post files will be saved.

---------

Co-authored-by: Fabio L R Diniz <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by:  Dusan Jovic <[email protected]>
…epo. 20240508 commit ufs-community#2275 (ufs-community#2259)

* UFSWM - Update CICE to CICE-Consortium (2024-05-01) and mom6 to its main repo (2024-05-08)
  * CICE - Update CICE to CICE-Consortium (2024-05-01)
  * MOM6 - Update mom6 to its main repo. 20240508 commit
* UFSWM  - Add a RT for SFS with hydrostatic options
  * FV3 - Remove -DUSE_COND and -DMOIST_CAPPA compiling flags for hydrostatic runs;
              Fix the issue to write out geopotential height for inline post in hydrostatic runs;
              Use omega from the model if defined in diag_table instead calculated in post
       * atmos_cubed_sphere - Remove -DUSE_COND and -DMOIST_CAPPA compiling flags for hydrostatic runs
…gfixes, sfcsub.F landmask bugfix, and canopy resistance output (ufs-community#2264)

* UFSWM, CMEPS, FV3/ccpp_physics - CCPP Physics bugfixes for metadata intents and sfcsub.f landmask and output changes for ozone diagnostics and canopy resistance
…add end of run restart functionality to MOM6 (was ufs-community#2286) (ufs-community#2205)

* UFSWM - Add support for optional arguments in ccpp physics and framework 
  * FV3 - [Add support for optional arguments in ccpp physics and framework](NOAA-EMC/fv3atm#807 (comment))
    * ccpp-physics - Introduce optional arguments in ccpp schemes and metadata
    * ccpp-framework - Add support (and tests) for optional arguments in ccpp_prebuild
    * atmos_cubed_sphere - Set cdata%thrd_cnt in driver/fvGFS/atmosphere.F90
  * MOM6 - Add end of run restart functionality to MOM6
  * stochastic_physics - Add optional attribute for variables where necessary
…+ develop]: Minor documentation bug fixes ufs-community#2296 (ufs-community#2281)

* UFSWM - Add new capability to allow diagnostic accumulation bucket to change in fv3atm integration
  * FV3 - Add new capability to allow diagnostic accumulation bucket to change in fv3atm integration 
  * UFSWM - Update requirements.txt; fix EMC broken link in Glossary; fix sample rt.sh run command for single RT run (add compiler)
…ity#2301) (ufs-community#2302)

* UFSWM - A few miscellaneous minor fixes to regression test scripts
 - Bring in changes for WCOSS2 to match the spack-stack 1.6.0 setup
 - Bring in updated pnetcdf/pio for CICE
 - Print 'ECFLOW Tasks Remaining' message only when the number of tasks changes
 - Remove explicit 'set -e'. Use -v command line option for verbose mode
 - Remove 'Computing PET bounds and tasks' message
 - Fix bugs with log generation script (from @BrianCurtis-NOAA)
 - Uncomment new_compile=true in rocoto_create_compile_task
 - Removed unneeded colonifnco
*UFSWM:
        *Updates modulefiles to spack-stack version 1.6.0
        *Updates Hera GNU version to 13.3
…or perturbation/increments for cold starts ufs-community#2271 (ufs-community#2269)

UFSWM - Update modulefiles/ufs_gaea.intel.lua to compile ufs_weather_model on Gaea-C5
    FV3 -
           - atmos_cubed_sphere - move the call to read_da_inc outside the if external_ic/restart logic
…nts (ATM_DS2S and ATM_DS2S-PCICE) and regression tests (atm_ds2s_docn_dice and atm_ds2s_docn_pcice) (ufs-community#2186)

* UFSWM - Add ATM_DS2S and ATM_DS2S-PCICE applications by adding CDEPS dice and enabling prescribed ice CICE. Add corresponding atm_ds2s_docn_dice and atm_ds2s_docn_dice-pcice regression tests. New gnv1_nested regression test with Water in the West domain at C96 resolution using templates compatible with global-workflow
  * CDEPS - Add dice cplhist datamode
  * CICE - Enable ice prescribed CICE mode
*UFSWM - update WAM RT compatible with v17
*UFSWM - fix derecho modulefile path for Spack Stackv1.6
…s_cubed_sphere to fix a typo when printing out the nest grid corner locations ufs-community#2323+Bump urllib3 from 2.2.1 to 2.2.2 in /doc/UsersGuide ufs-community#2329 + Orion changes for switch to new OS - Rocky-9 ufs-community#2336 (ufs-community#2324)

  * CICE - Adds restart write capability at the end of a run for CICE
  * FV3 - 
    * atmos_cubed_sphere - Update submodule FV3/atmos_cubed_sphere to fix a typo when printing out the nest grid corner locations
    * doc/UsersGuide/requirements.txt: Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.1 to 2.2.2.
    * Orion Spack stack modulefile update: Rocky-9
    * update detect_machine.sh: hercules
… similar to hydrostatic method (ufs-community#2327)

    * atmos_cubed_sphere - 
               A new parameter, pass_full_omega_to_physics_in_non_hydrostatic_mode, has been added in 
               dycore. When set to true, the omega calculation will match that of hydrostatic runs, using the 
               formula omega = dp/dt. The default value is false, where the calculation remains
               omega = w * dp/dz as before.
* HR4 GWD update for FV3

* point to PR#549 of ccpp-framework

* Update default_vars.sh: GWD parameters

* Update global_control.nml.IN

* update cpld case GWD parameters: gfsv17

* Update Jenkinsfile.combined fix multi-label removal

* Update Jenkinsfile for ORT Pipeline

* update input oro files for control_run.IN: gsfv17

---------

Co-authored-by: Grant Firl <[email protected]>
Co-authored-by: Jong Kim <[email protected]>
Co-authored-by: Dustin Swales <[email protected]>
Co-authored-by: zach1221 <[email protected]>
* UFSWM - 
  * FV3 - 
    * atmos_cubed_sphere - bug fix to address debug mode crashes caused by floating-point exception in subroutine a2b_ord2 in model/a2b_edge.F90
…nd PR#2265) (ufs-community#2335)

* UFSWM - restore error checking to regression test system and add a self-test suite
	        - Detect_machine.sh identifies Frontera
---------
Co-authored-by: Sam Trahan <[email protected]>
Co-authored-by: Benjamin Cash <[email protected]>
… in the GFS physics suite (ufs-community#2340)

* ccpp-physics - update convection and PBL schemes to improve cloud/convection interaction

* Output updraft value of convective cloud condensate in FV3 and CCPP

* update xkinv1 to 0.15

* add check if progsigma is true
* HR4 land surface upgrades to address surface cold biases

* update noahmp table
  * CMEPS - Sync CMEPS with ESCOMP/main.
…ity#2355)

* UFSWM - Fix dumpfields=true option in FV3 by using ESMF_FieldBundleWrite
  * FV3 - Fix dumpfields=true option by using ESMF_FieldBundleWrite

* Update rt_utils.sh. Set ECF_HOST on wcoss2 explicitly
…y#2373)

* UFSWM - Adds pass_full_omega_to_physics_in_non_hydrostatic_model parameter in the global_control.nml.IN namelist and
          sets it to true for non-hydrostatic runs. An additional field (omga) has been added to the diag_tables.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.