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

Dust emissions control moved to cmeps #2545

Merged
merged 58 commits into from
Jul 30, 2024
Merged

Commits on Apr 26, 2024

  1. Merge tag 'ctsm5.2.002' into dustcontrolincmeps

    FATES default allometry parameter file update
    
    This updates the default FATES parameter file which includes a number
    of changes:
    
       - Default global tree pft allometry update
       - New allometric mode options
       - New scaling coefficients for alternative leaf maintenance respiration
       - New switch to control the use of host land model day length scaling factor
    
    This also incorporates some testing additions and clean up, including:
    
       - Removes cheyenne expected failure tests that have been converted to derecho
       - Adds a 5x5_amazon test to aux_clm and the expected failures list
       - Temporarilry converts a fates 5x5_amazon test to f10 test
       - Adds namelist check and corresponding unit test to make sure fates hydro
         and fates satellite phenology mode can not be used together
    
    The FATES externals tag is also updated which includes a number of bug fixes
    and the addition of new history output.
    ekluzek committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    8a90024 View commit details
    Browse the repository at this point in the history
  2. Update cmeps to the branch

    ekluzek committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    66c1004 View commit details
    Browse the repository at this point in the history
  3. Add shr_dust_emis_mod.F90 to the files needed for unit testing, fails…

    …, because ESMF is currently needed and not available
    ekluzek committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    f8aa6ea View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Configuration menu
    Copy the full SHA
    b767a82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    82704fe View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    118010d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    516d147 View commit details
    Browse the repository at this point in the history
  5. Add more tests that pass

    ekluzek committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    5cf5dc0 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Configuration menu
    Copy the full SHA
    c2d226c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0ff68d7 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Add LND_SETS_DUST_EMIS_DRV_FLDS which will be used to NOT set dust_em…

    …is drv_flds_in settings when CAM is going to set them
    ekluzek committed May 4, 2024
    Configuration menu
    Copy the full SHA
    f65de8f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    89f0871 View commit details
    Browse the repository at this point in the history
  3. Merge tag 'ctsm5.2.003' into dustcontrolincmeps

    Merge b4b-dev into master 2024-05-02
    ekluzek committed May 4, 2024
    Configuration menu
    Copy the full SHA
    bcf0521 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Configuration menu
    Copy the full SHA
    6f8021c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f52f76f View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Update cmeps to the branch

    ekluzek committed May 15, 2024
    Configuration menu
    Copy the full SHA
    8aa0a70 View commit details
    Browse the repository at this point in the history
  2. Add shr_dust_emis_mod.F90 to the files needed for unit testing, fails…

    …, because ESMF is currently needed and not available
    ekluzek committed May 15, 2024
    Configuration menu
    Copy the full SHA
    603d267 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0b48097 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d2d2da4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    66578f0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a692769 View commit details
    Browse the repository at this point in the history
  7. Add more tests that pass

    ekluzek committed May 15, 2024
    Configuration menu
    Copy the full SHA
    a65752d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    dd73ca6 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ccd976a View commit details
    Browse the repository at this point in the history
  10. Add LND_SETS_DUST_EMIS_DRV_FLDS which will be used to NOT set dust_em…

    …is drv_flds_in settings when CAM is going to set them
    ekluzek committed May 15, 2024
    Configuration menu
    Copy the full SHA
    65fc553 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    d9c94eb View commit details
    Browse the repository at this point in the history
  12. Update ChangeLog and ChangeSum.

    samsrabin authored and ekluzek committed May 15, 2024
    Configuration menu
    Copy the full SHA
    0c23d08 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    747d104 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    c36f3a9 View commit details
    Browse the repository at this point in the history
  15. Git rebase didn't correct the change files for some reason, so going …

    …back to the b4b-dev version of those
    ekluzek committed May 15, 2024
    Configuration menu
    Copy the full SHA
    8ab4063 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Have build-namelist not do the dust emission namelist settings, when …

    …the XML variable is set for CAM to do it, and add a test for this
    ekluzek committed May 16, 2024
    Configuration menu
    Copy the full SHA
    b706c5a View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge remote-tracking branch 'escomp/b4b-dev' into dustcontrolincmeps

     Conflicts:
    	Externals.cfg
    	bld/unit_testers/build-namelist_test.pl
    ekluzek committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    4b0c2ae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cb7376e View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge remote-tracking branch 'escomp/b4b-dev' into dustcontrolincmeps

     Conflicts:
    	bld/unit_testers/build-namelist_test.pl
    ekluzek committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    9878509 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Changes to remove dust_emis namelist items from CTSM fortran code and…

    … use shr_dust_emis_mod from CMEPS
    ekluzek committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    17fb3d8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dustcontrolincmeps' of github.com:ekluzek/CTSM into dus…

    …tcontrolincmeps
    
     Conflicts:
    	Externals.cfg
    	bld/CLMBuildNamelist.pm
    	bld/unit_testers/build-namelist_test.pl
    	src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
    ekluzek committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d8ce02c View commit details
    Browse the repository at this point in the history
  3. Update test number

    ekluzek committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    7dd9af0 View commit details
    Browse the repository at this point in the history
  4. Update cmeps and ccs_config to versions used in ESCOMP#2590 which all…

    …ows cases to build
    ekluzek committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    976347d View commit details
    Browse the repository at this point in the history
  5. Update cmeps and ccs_config to versions used in ESCOMP#2590 which all…

    …ows cases to build
    ekluzek committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    170b3a5 View commit details
    Browse the repository at this point in the history
  6. Update number of tests and comment out the whole values section as it…

    … fails without at least one thing set
    ekluzek committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    ba28bea View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Merge tag 'ctsm5.2.011' into merge-master-20240712

    Merge b4b-dev
    slevis-lmwg committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    61b3cb4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3de6f95 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Update bld/unit_testers/build-namelist_test.pl

    Syntax of breaking up into two lines was confusing, so just making a longer line that is more clear.
    ekluzek authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    5686def View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7dbc538 View commit details
    Browse the repository at this point in the history
  3. Make fail tests lines where the namelst option is split up into two l…

    …ines into one long line, because the way they were concatonated look obscure and possibly wrong, the long lines are easier to read
    ekluzek committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    02f9cb3 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'dustcontrolincmeps' of github.com:ekluzek/CTSM into dus…

    …tcontrolincmeps
    
    Also add a deisgn note the dust emission factory.
     Conflicts:
    	bld/unit_testers/build-namelist_test.pl
    ekluzek committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    561ad17 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge branch 'b4b-dev' into dustcontrolincmeps

     Conflicts:
    	bld/CLMBuildNamelist.pm
    	bld/unit_testers/build-namelist_test.pl
    ekluzek committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    be96436 View commit details
    Browse the repository at this point in the history
  2. Comments about move to CMEPS

    ekluzek committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    8478b73 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Configuration menu
    Copy the full SHA
    b11bc89 View commit details
    Browse the repository at this point in the history
  2. Get LILAC test working

    ekluzek committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    38656f9 View commit details
    Browse the repository at this point in the history
  3. Merge tag 'ctsm5.2.015' into dustcontrolincmeps

    Update submodule tags to pass runoff from cism to rof
    
    - Update MOSART, CMEPS, and CISM so CISM runoff goes to ROF rather than CTSM
    - Update RTM with fix needed for Paleo LGM work
    
    Contributors:
    @mvertens, @jedwards4b, @billsacks, @Katetc, @ekluzek, @slevis-lmwg
    
     Fixes ESCOMP#2590 Update CMEPS/MOSART/CISM/RTM tags
     Fixes ESCOMP/RTM#50 Likely wrong RTM river flux to MOM6 within cesm2_3_beta17
    
     Differences in namelist 'mosart_inparm':
      missing variable: 'do_rtmflood'
      missing variable: 'finidat_rtm'
      missing variable: 'frivinp_rtm'
      missing variable: 'rtmhist_fexcl1'
      missing variable: 'rtmhist_fexcl2'
      missing variable: 'rtmhist_fexcl3'
      missing variable: 'rtmhist_fincl1'
      missing variable: 'rtmhist_fincl2'
      missing variable: 'rtmhist_fincl3'
      missing variable: 'rtmhist_mfilt'
      missing variable: 'rtmhist_ndens'
      missing variable: 'rtmhist_nhtfrq'
      found extra variable: 'budget_frq'
      found extra variable: 'fexcl1'
      found extra variable: 'fexcl2'
      found extra variable: 'fexcl3'
      found extra variable: 'fincl1'
      found extra variable: 'fincl2'
      found extra variable: 'fincl3'
      found extra variable: 'finidat'
      found extra variable: 'frivinp'
      found extra variable: 'mfilt'
      found extra variable: 'mosart_euler_calc'
      found extra variable: 'mosart_tracers'
      found extra variable: 'ndens'
      found extra variable: 'nhtfrq'
      found extra variable: 'use_halo_option'
    
    Changes answers
    - what code configurations: mosart and rtm
    - what platforms/compilers: all
    - nature of change: mosart roundoff; rtm larger than roundoff due to bug fix; the latter also affects bgc variables
    
     We are ignoring strange diffs from baseline in two tests in variable
     FATES_TRANSITION_MATRIX_LULU as explained in issue ESCOMP#2656.
    
     Conflicts:
    	bld/unit_testers/build-namelist_test.pl
    ekluzek committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    28fbfa7 View commit details
    Browse the repository at this point in the history
  4. Fix test number

    ekluzek committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    e438a90 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. LILAC needs to read and handle the drv_flds_in file as dust emission …

    …settings are required and it's namelist must be read
    ekluzek committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    0f9fee7 View commit details
    Browse the repository at this point in the history
  2. Merge tag 'ctsm5.2.016' into dustcontrolincmeps

     Enable new crop calendars for clm60 compsets
    
    This commit switches clm60 compsets (really, any compset other than clm45, clm50, and clm51) to use:
    - Per-gridcell and -crop sowing windows derived from the GGCMI phase 3b group II static growing seasons
    - Per-gridcell and -crop maturity requirements derived from those same growing seasons, over the 1980-2009 growing seasons
    - Code to adjust those prescribed maturity requirements based on recent climate
    ekluzek committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    0c527dd View commit details
    Browse the repository at this point in the history
  3. Fix 1x1_cidadinhoBR tests by specifying 2000_control for it and 1850_…

    …control for smallville
    ekluzek committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    17c748b View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Fix test numbers

    ekluzek committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    4d4fe83 View commit details
    Browse the repository at this point in the history
  2. Update change files

    ekluzek committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    cdb36a0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f28ecdb View commit details
    Browse the repository at this point in the history