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

Update ctsm5.2 branch to ctsm5.1.dev176 and some small updates #2464

Merged
merged 101 commits into from
Apr 19, 2024

Commits on Mar 13, 2023

  1. An initial commit to enable CLM to read in Zender's soil erodibility …

    …streams (dmleung 12 Mar 2023)
    dmleung committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    8434fbb View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. first commit on adding a global tuning factor to tune global total du…

    …st emission (dmleung 20 Mar 2023)
    dmleung committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    2c9974c View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. After discussing with CAM people, I took away the lines relevant to t…

    …he global tuning factor.
    
    We will keep the global tuning factor in CAM. dmleung 5 Apr 2023
    dmleung committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    4f5dcb9 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Merge tag 'ctsm5.1.dev122' into zendersource_dev

    Rework handling of evaporation constraint in SoilFluxes
    
    Occasionally, h2osoi_ice was going significantly negative in
    UpdateState_TopLayerFluxes - see
    ESCOMP#1979. As noted in that issue, this
    seems to be due to h2osoi_ice having a very different magnitude from
    h2osoi_liq, leading to greater-than-roundoff-level differences from zero
    final state in a relative sense (i.e., relative to the magnitude of
    h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice +
    h2osoi_liq) in the equations that limit fluxes.
    
    To try to deal with this, I have reworked the handling of the
    evaporation constraint to directly limit both the liqevap and solidevap,
    so that both of them should result in the equivalent liq or ice states
    going to 0 within roundoff.
    
    To do that, I needed to move the partitioning of the total flux into
    liquid and solid to earlier in the subroutine and then recalculate those
    partitioning fluxes in conditions where we're applying an evaporation
    constraint.
    
    Note that I applied a max of 0 to the new fluxes because many initial
    conditions files have roundoff-level negative H2OSOI_LIQ, so without
    this limit, we were getting roundoff-level negative fluxes.
    
    Resolves ESCOMP#1979
    ekluzek committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    7616b5c View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Configuration menu
    Copy the full SHA
    f4dde3d View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Configuration menu
    Copy the full SHA
    2a2caf1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    35b1f4a View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Some updates from the review, this compiles, but fails to run when it…

    … gets to the soil eroditability file
    ekluzek committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    a27f6f5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cb81fdb View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Add lnd_tuning modes for CAM4.0 and CAM5.0 for all CLM physics option…

    …s and add tests for it that currently fail
    ekluzek committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    019282a View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2023

  1. Get cam4,cam5 options working with coldstarts, add more tests, make s…

    …ure lnd_tuning_mode has all of the clm physics options paired with all of the forcing types, build-namelist tests now pass
    ekluzek committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    70289af View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a931e74 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Merge tag 'ctsm5.1.dev166' into zendersource_dev

    BFB merge tag dev166
    
    2315 @TeaganKing Refactoring run_neon for PLUMBER2 part1
    2326 @samsrabin run_sys_tests: Check Python environment for FatesColdTwoStream tests
    2213 @samsrabin Automatically assign high priority items to project 25
    2330 @samsrabin Add Izumi version of the aux_clm unit testing
    
     Conflicts:
    	bld/namelist_files/namelist_defaults_ctsm.xml
    	bld/namelist_files/namelist_definition_ctsm.xml
    	bld/unit_testers/build-namelist_test.pl
    	cime_config/config_component.xml
    ekluzek committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    a22b089 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. Add two new namelist options to control the dust emission method and …

    …for the Zender scheme how the soil eroditability file is handled
    ekluzek committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    08d3c86 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Configuration menu
    Copy the full SHA
    3553bef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8a9f513 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Configuration menu
    Copy the full SHA
    dd61c14 View commit details
    Browse the repository at this point in the history
  2. Add new test mods that include using Zender_2003 dust and lnd_tuning_…

    …modes for CAM4 and CAM5
    ekluzek committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    0d19e85 View commit details
    Browse the repository at this point in the history
  3. Add in the new dust handling namelist parameters, and some control lo…

    …gic for it, this compilers, but does NOT run
    ekluzek committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    c3f2b30 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. Get simple case with Zender soil eroditablity off working so SMS_D_Ld…

    …1_Mmpi-serial.1x1_brazil.I2000Clm51SpRs.derecho_gnu.clm-clm51cam6LndTuningMode PASSes
    ekluzek committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    15bf184 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0b9c979 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2024

  1. Configuration menu
    Copy the full SHA
    3921fbf View commit details
    Browse the repository at this point in the history
  2. Add dust soil eroditability files for all CAM options, which requires…

    … a version for each lnd_tuning_mode, and for CAM4 cases for the f09 grid
    ekluzek committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    2ad96ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3011818 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7e226ba View commit details
    Browse the repository at this point in the history
  5. Correct namelist name

    ekluzek committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    ef7a41a View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Configuration menu
    Copy the full SHA
    1941d2a View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Configuration menu
    Copy the full SHA
    68a35de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f8e983 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Use straight logic rather than a logical not of the straightforward c…

    …ase for simplicity, suggested by @slevis-lmwg
    ekluzek committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    2d9aacc View commit details
    Browse the repository at this point in the history
  2. Change names with zendersoilerod in them, in some cases removing the …

    …zender part of it, and for zendersoilerodmapalgo add a underscore for readability
    ekluzek committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    8c42551 View commit details
    Browse the repository at this point in the history
  3. Fix some issues from comments in the PR, make sure all namelist items…

    … are broadcast, remove an unneeded item, add checks that namelist items are set (or not set) appropriately
    ekluzek committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    1421d6d View commit details
    Browse the repository at this point in the history
  4. Fix issue so will compile

    ekluzek committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    b66c1f0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    23eb33b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4de177b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    cd005b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Configuration menu
    Copy the full SHA
    9dc57da View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Merge tag 'ctsm5.1.dev174' into zendersource_dev

    Changes to improve vegetation health at high latitudes
    
    Details in PR ESCOMP#2348
    
     Conflicts:
    	bld/unit_testers/build-namelist_test.pl
    ekluzek committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    dd87593 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Configuration menu
    Copy the full SHA
    04d7790 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Configuration menu
    Copy the full SHA
    d0537d1 View commit details
    Browse the repository at this point in the history
  2. Merge tag 'ctsm5.1.dev175' into merge-b4bdev-20240321

    Merge b4bdev 20240321
    slevis-lmwg committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    c76af67 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Merge pull request ESCOMP#2432 from slevis-lmwg/merge-b4bdev-20240321

    Merge tag 'ctsm5.1.dev175' into b4bdev
    slevis-lmwg authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    4ffba74 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f5168f9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    67bbf59 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Configuration menu
    Copy the full SHA
    1d64435 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d8ae9cd View commit details
    Browse the repository at this point in the history
  3. Remove trailing whitespace

    ekluzek committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    36bfba6 View commit details
    Browse the repository at this point in the history
  4. Another trailing blank

    ekluzek committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    7943f8d View commit details
    Browse the repository at this point in the history
  5. More trailing whitspace

    ekluzek committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    20e3fe9 View commit details
    Browse the repository at this point in the history
  6. Correct number of tests

    ekluzek committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    b63459e View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Remove a bunch of uneeded settings for initial conditions and use_ini…

    …t_interp, this gets the ERI_D.ne30pg3_t232.I1850Clm51BgcCrop.derecho_intel.clm-clm51cam6LndTuningMode test giving identical answers as baseline
    ekluzek committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    296a00e View commit details
    Browse the repository at this point in the history
  2. Change compilers up for ZDustSoilErod tests a bit, and make sure ther…

    …e is a izumi_nag test
    ekluzek committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    b01fbb5 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Merge pull request ESCOMP#1967 from dmleung/zendersource_dev

    Move the dust emission source function soil erodibility for the Zender scheme from CAM to CTSM
    ekluzek authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    e007f67 View commit details
    Browse the repository at this point in the history
  2. changes needed for adding a dglc

    Mariana Vertenstein committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ef7de61 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Merge branch 'master' into feature/add_dglc

    Mariana Vertenstein committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    79d431f View commit details
    Browse the repository at this point in the history
  2. reformat using black

    jedwards4b committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    29f5bbb View commit details
    Browse the repository at this point in the history
  3. refactored the use of GLC_USE_ANTARCTICA

    Mariana Vertenstein committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    bedafa3 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. make black happy

    mvdebolskiy committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    4d7b488 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Update cism tag

    ekluzek committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    a69456e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1d6cea3 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Merge pull request ESCOMP#2449 from mvertens/feature/add_dglc

    change needed for the addition of a dglc component in cdeps
    ekluzek authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    d79c236 View commit details
    Browse the repository at this point in the history
  2. add new expected fails

    adrifoster committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    5d06a72 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. change izumi test to f10

    adrifoster committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    8704598 View commit details
    Browse the repository at this point in the history
  2. update changelog

    adrifoster committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    e54f08a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a65df14 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Configuration menu
    Copy the full SHA
    b32df77 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ec9af2d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    91a4906 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c9f13bd View commit details
    Browse the repository at this point in the history
  5. Updates to ChangeLog from @slevis-lmwg review, and a few additions fr…

    …om going through issues
    ekluzek committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    146d44a View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Add cam7.0 LND_TUNING options

    ekluzek committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5b1ee03 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    705d0c7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9b5ef22 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6bfb9af View commit details
    Browse the repository at this point in the history
  5. Merge tag 'ctsm5.1.dev176' into updatetodev176

    Merge b4b-dev
    
     Conflicts:
    	bld/namelist_files/namelist_defaults_ctsm.xml
    	bld/namelist_files/namelist_defaults_overall.xml
    	bld/namelist_files/namelist_definition_ctsm.xml
    	bld/unit_testers/build-namelist_test.pl
    	cime_config/config_component.xml
    	cime_config/testdefs/testlist_clm.xml
    	doc/ChangeLog
    	doc/ChangeSum
    ekluzek committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    156fb3a View commit details
    Browse the repository at this point in the history
  6. Merge branch 'updatetodev176' of github.com:ekluzek/CTSM into updatet…

    …odev176
    
     Conflicts:
    	cime_config/config_component.xml
    	doc/ChangeSum
    ekluzek committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    63bda08 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Update doc/ChangeLog

    From @slevis-lmwg suggestion.
    
    Co-authored-by: Samuel Levis <slevis@ucar.edu>
    ekluzek and slevis-lmwg authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    7cd7f80 View commit details
    Browse the repository at this point in the history
  2. Get namelist working

    Update namelist with needed cam4.0,
    cam5.0, and clm6_0 changes so that the
    namelist tester works and compares as expected to the previous version.
    ekluzek committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    babd281 View commit details
    Browse the repository at this point in the history
  3. Remove the unneeded PE layout changes

    for ctsm_sci tests with the updated default
    PE layouts we have in place.
    ekluzek committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    ec7814c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Fix a mistake that got in

    ekluzek committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    91aadeb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    98a0ea4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    96ca8c1 View commit details
    Browse the repository at this point in the history
  4. Add cam4/cam5 to LND_TUNING_MDOE

    Make sure CAM4/CAM5 options are including in the mapping in buildnml for LND_TUNING_MODE. Right now they are just warning about what the tuning is based on.
    ekluzek committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    e92db99 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'updatetodev176' of github.com:ekluzek/CTSM into updatet…

    …odev176
    
     Conflicts:
    	cime_config/buildnml
    ekluzek committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    8a255d0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0b239c2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8e0334e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Configuration menu
    Copy the full SHA
    b5667fa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    434edda View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f0f0743 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fbe3285 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4f541fe View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    374f8b8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b41171a View commit details
    Browse the repository at this point in the history
  8. Add one of the NEON tests in the fates testsuite to expected fail for…

    … NEON server or file length issues
    ekluzek committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    aca1530 View commit details
    Browse the repository at this point in the history
  9. Another FATES expected fail

    ekluzek committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    172e746 View commit details
    Browse the repository at this point in the history
  10. Another expected fails

    ekluzek committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    52bec1f View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Configuration menu
    Copy the full SHA
    447d783 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Add expected fail for a MOSART test because it's using a Clm51 compse…

    …t and needs to update to Clm60
    ekluzek committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    35404eb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6926f4b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ce6605c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    78b2267 View commit details
    Browse the repository at this point in the history