From 2de91fade00ed80b893cb69c53782a639dea8805 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Tue, 30 Jul 2024 08:04:31 -0600 Subject: [PATCH 01/33] update ChangeLog to latest master --- ChangeLog | 395 +----------------------------------------------------- 1 file changed, 1 insertion(+), 394 deletions(-) diff --git a/ChangeLog b/ChangeLog index 244cb5e05..3fa08760d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,400 +1,7 @@ -============================================================== -Tag name: cesm3_0_alpha02b -Originator(s): CSEG -Date: 29 July 2024 -One-line Summary: CAM answer changing tag - -components/cam https://github.com/ESCOMP/CAM/cam6_4_016 ** -components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_12 ** -cime https://github.com/ESMCI/cime/tree/cime6.1.0 -- -share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 -- -ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.1 ** -components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.6 ** -components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.43 -- -components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 -- -components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.2.009 -- -components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240516 -- -components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 -- -components/mom https://github.com/ESCOMP/MOM_interface/mi_240705 -- -components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 -- -components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 -- -components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.2 -- -libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_2 -- - -cam - Cheryl Craig 2024-07-23 - cam6_4_016 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_xxx - - Modify RRTMGP interface for MT configurations. Answers also change - for LT and cam6 tests using RRTMGP. - - - Cheryl Craig 2024-07-23 - cam6_4_015 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_015 - - For Brian Eaton - - Misc bug fixes, buildcpp reports errors in CAM configure, SILHS outputting subcolumns with zeroes fix, remove solar_htng_spctrl_scl from aquaplanet case - - - Francis Vitt 2024-07-22 - cam6_4_014 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_014 - - Clean up WACCMX use of ESMF gridded component - - - Francis Vitt 2024-07-21 - cam6_4_013 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_013 - - Aerosol wet removal bug fixes - - - Francis Vitt 2024-07-19 - cam6_4_012 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_012 - - Add climate-chemistry compset - - - Cheryl Craig 2024-07-19 - cam6_4_011 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_011 - - For Brian Eaton and Cheryl Craig - - Update submodules, git-fleximod; fix fv3 build; remove mct reference - - - Cheryl Craig 2024-07-16 - cam6_4_010 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_010 - - GW moving mountains - - Answer changing for CAM7 - - - Brian Dobbins 2024-07-11 - cam6_4_009 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_009 - - Changes older log-gamma function for an F2008 intrinsic. This is answer-changing, but only in certain WACCMX configurations. - - - Cheryl Craig 2024-07-10 - cam6_4_008 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_008 - - HB mods + dycore mods - - Answer changing for all SE dycore and CLUBB runs - - - Michael Waxmonsky 2024-07-10 - cam6_4_007 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_007 - - CCPP-ized TJ2016 #1070 - - - Brian Eaton 2024-07-03 - cam6_4_006 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_006 - - Fix CLUBB interface bug. - - - Brian Eaton 2024-07-01 - cam6_4_005 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_005 - - Limit vertical domain used by COSP - - - Francis Vitt 2024-06-29 - cam6_4_004 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_004 - - Misc corrections for WACCMX - - - Brian Eaton 2024-06-26 - cam6_4_002 - components/cam (cesm3_0_beta02) - https://github.com/ESCOMP/CAM/tags/cam6_4_002 - - Activate additional clubb diffusion in cam6. - - -ccs_config - James Edwards 2024-07-25 - ccs_config_cesm1.0.1 - ccs_config (cesm3_0_beta02) - https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.1 - - Removes some obsolete grid definitions - - -cesm - James Edwards 2024-07-25 - cesm3_0_alpha02b - (cesm3_0_beta02) - https://github.com/ESCOMP/cesm/tags/cesm3.0.beta02 - not sure what this should be? - - Add pelayout for B1850MT. Update git-fleximod to v0.8.4 - - -cice - David Bailey 2024-07-02 - cesm_cice6_5_0_12 - components/cice (cesm3_0_beta02) - https://github.com/ESCOMP/CESM_CICE/tags/cesm_cice6_5_0_11 - - This fixes some of the git-fleximod stuff and updates the CICE version - from cice6_5_0_20231221 to cice6_5_0_20240702. - - Also removes the annual restarts from CICE. - - -cmeps - James Edwards 2024-07-25 - cmeps1.0.6 - src/drivers/nuopc/ (cesm3_0_beta02) - https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.6 - - Fix merge error in med_phases_aoflux_mod.F90 - - - James Edwards 2024-07-25 - cmeps1.0.5 - src/drivers/nuopc/ (cesm3_0_beta02) - https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.5 - - Declare cnt variable needed with ESMF_AWARE_THREADING - - -============================================================== -Tag name: cesm3_0_alpha02a -Originator(s): CSEG -Date: 16 July 2024 -One-line Summary: First set of changes from components in preparation for the science capability freeze. - -components/cam https://github.com/ESCOMP/CAM/cam6_4_001 ** -components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_9 -- -cime https://github.com/ESMCI/cime/tree/cime6.1.0 ** -share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 ** -ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.0 ** -components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.2 ** -components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.43 ** -components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 ** -components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.2.009 ** -components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240516 -- -components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 ** -components/mom https://github.com/ESCOMP/MOM_interface/mi_240705 ** -components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 ** -components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 ** -components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.2 -- -libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_2 -- - -cam - Cheryl Craig 2024-06-24 - cam6_4_001 - components/cam (cesm3_0_alpha02a) - https://github.com/ESCOMP/CAM/tags/cam6_4_001 - - For Brian Eaton- - - Change cam_dev to CAM7 - - Requires cmeps0.14.67 - - -ccs_config - James Edwards 2024-06-28 - ccs_config_cesm1.0.0 - ccs_config (cesm3_0_alpha02a) - https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config1.1.0 - - ccs_config_cesm1.0.0: Fix cmake for github workflow, remove mapping files that are no longer used. - ccs_config_cesm0.0.113: Fix cmake for github workflow - ccs_config_cesm0.0.112: Add Cidadinho test site - ccs_config_cesm0.0.111: Removal of mapping files that are no longer needed for cism->mosart - ccs_config_cesm0.0.110: Add a PFUNIT for github workflow of cesm_share - ccs_config_cesm0.0.109: Making additions to Depends.nvhpc to enable GPU compilation of clubb code. - - -cdeps - James Edwards 2024-06-28 - cdeps1.0.43 - components/cdeps (cesm3_0_alpha02a) - https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.43 - - cdeps1.0.43: Add dglc - cdeps1.0.42: Fix initialization of dglc import/export pointers - cdeps1.0.41: Add changes to exchange between SOM and WW3DEV. - cdeps1.0.40: Updates the fox build since the directory now always exists - cdeps1.0.39: Allow input of stream on unstructured mesh (e.g. mpas) - cdeps1.0.38: Update stream_definition_datm.xml to include longer time period in files - - -cesm - James Edwards 2024-06-26 - cesm3.0-alphabranch - (cesm3_0_alpha02a) - https://github.com/ESCOMP/cesm/tags/cesm3.0-alphabranch - - updates git-fleximod subtree, updates testmods for mosart - - -cime - James Edwards 2024-06-26 - cime6.1.0 - cime (cesm3_0_alpha02a) - https://github.com/ESMCI/cime/tags/cime5.7.0 - - cime6.1.0: Update Makefile, remove mct from build. - cime6.0.251: Remove mct for cesm - cime6.0.250: Remove esmf wrf timemanager - cime6.0.249: Remove broken unsupported tool - cime6.0.248: The xmlchange tool should not raise an exception when a diff is detected. - cime6.0.247: More robust approach to waiting for many threads - cime6.0.246: Remove reference to cice5 and ww3dev, no longer required - - -cism - James Edwards 2024-06-26 - cismwrap_2_2_002 - components/cism (cesm3_0_alpha02a) - https://github.com/ESCOMP/cism-wrapper/tags/cismwrap_2_2_002 - - GLC->mosart runoff - - -clm - Erik Kluzek 2024-06-28 - ctsm5.2.009 - components/clm (cesm3_0_alpha02a) - https://github.com/ESCOMP/ctsm/tags/ctsm5.2.009 - - Add support for CAM7 in CTSM. Also allow for "C" and "E" after period in long compset names. - Fix a couple bugs related to these changes. - - Changes answers for the: clm45cam4LndTuningModeZDustSoilErod, clm50cam5LndTuningModeZDustSoilErod - test mods - - This is required for: cam6_4_001 - - - Erik Kluzek 2024-06-06 - ctsm5.2.008 - components/clm (cesm3_0_alpha02a) - https://github.com/ESCOMP/ctsm/tags/ctsm5.2.008 - - Updates along our temporary branch - - b4b-dev changes: fix prescribed crop calendar test add more checking for it, dust emission to OO - Update git-fleximod - - Hillslope hydrology changes: Changes answer ONLY for hillslope tests - - -cmeps - William Sacks 2024-07-09 - cmeps1.0.2 - src/drivers/nuopc/ (cesm3_0_alpha02a) - https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.?? - - https://github.com/ESCOMP/CMEPS/pull/481 - - This reverts some of the answer changes that came in with cmeps0.14.71, so ideally this PR will be included in the same CESM alpha tag as cmeps0.14.71, but that isn't critical. - - - James Edwards 2024-07-09 - cmeps1.0.1 - src/drivers/nuopc/ (cesm3_0_alpha02a) - https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.1 - - Fix for issue with gnu compiler - - - James Edwards 2024-06-26 - cmeps1.0.0 - src/drivers/nuopc/ (cesm3_0_alpha02a) - https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.0 - - cmeps1.0.0: Add support for glc->rtm runoff depends on mosart and cism tags. - cmeps0.14.77: Bug fix primarily for usf testing - cmeps0.14.76: New fix for add_gusts - cmeps0.14.75: Bug fix for wav2ocn_map - cmeps0.14.74: Add trigrid capability - ability to run atm and lnd on separate grids - cmeps0.14.73: Add shr_dust_emis_mod to handle options for dust emissions between CTSM and CAM - cmeps0.14.72: Add bilinr_nostd for wav2ice coupling - cmeps0.14.71: Remove negative runoff - cmeps0.14.70: mct_init call is no longer needed - cmeps0.14.69: Fix aoflux for UFS - cmeps0.14.68: Implementation of glc->ocn coupling via going through mosart - cmeps0.14.67: Change CAM%DEV to CAM70 in buildnml - cmeps0.14.66: Replace manage-externals with git-fleximod - cmeps0.14.65: Revert "test github testing in cime PR #4631" - cmeps0.14.64: Test github testing in cime PR #4631 - - -MCT - James Edwards 2024-06-26 - NONE - libraries/mct (cesm3_0_alpha02a) - https://github.com/MCSclimate/MCT/tags/NONE - - Remove from DB - - -mizuRoute - Erik Kluzek 2024-06-20 - cesm-coupling.n02_v2.1.3 - components/mizuroute (cesm3_0_alpha02a) - https://github.com/ESCOMP/mizuRoute/tags/cesm-coupling.n02_v2.1.3 - - Makefile cleanup, get working on intel-oneapi - Add some new capability for floodplain and other routing methods - - -mom - James Edwards 2024-07-05 - mi_240705 - components/mom (cesm3_0_alpha02a) - https://github.com/ESCOMP/MOM_interface/tags/mi_240705 - - fms library path change - - -mosart - Erik Kluzek 2024-06-20 - mosart1.1.02 - components/mosart (cesm3_0_alpha02a) - https://github.com/ESCOMP/mosart/tags/mosart1.1.02 - - Starts adding capability to receive runoff from CISM directly. - - For the new capability depends on: - CMEPS - CISM - - - James Edwards 2024-06-07 - mosart1.1.01 - components/mosart (cesm3_0_alpha02a) - https://github.com/ESCOMP/mosart/tags/mosart1.1.01 - - Brings in changes from nor-esm - Refactoring and halo update capability - - -rtm - Erik Kluzek 2024-06-21 - rtm1_0_80 - components/rtm (cesm3_0_alpha02a) - https://github.com/ESCOMP/rtm/tags/rtm1_0_80 - - Correct fluxes by area - - -share - James Edwards 2024-06-26 - share1.1.2 - share (cesm3_0_alpha02a) - https://github.com/ESCOMP/CESM_share/tags/share1.1.1 - - share1.1.2: Remove mct and other unused code, add nuopc_shr_methods add github action for unit testing - share1.1.1: Add m_MergeSorts from mpeu for sort routines used in cam - share1.1.0: Add GitHub pfunit tests - - -============================================================== -Tag name: cesm3_0_beta01 -Originator(s): CSEG -Date: 25 June 2024 -One-line Summary: git-fleximod and remove externals for CESM3 - - -components/cam https://github.com/ESCOMP/CAM/cam6_3_162 -components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_9 -cime https://github.com/ESMCI/cime/tree/cime6.0.246 -share https://github.com/ESCOMP/CESM_share/tree/share1.0.19 -ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm0.0.109 -components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps0.14.63 -components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.37 -components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_001 -components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.2.007 -components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240516 -components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.2 -components/mom https://github.com/ESCOMP/MOM_interface/mi_240522 -components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_0_49 -components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_79 -components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.2 -libraries/mct https://github.com/MCSclimate/MCT/tree/MCT_2.11.0 -libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_2 - -Answer Changes introduced with this tag when compared to cesm2_3_beta17: - WW3DEV moved to WW3 - All B compsets switched from POP to MOM. - -Problems identified after tag creation: - -Several MEMCOMP test failed because cpl-mem.log files weren't generate. - This is an issue with cime not creating the log file when the runs are too short. - -Fully active restart tests are failing because the rpointer files are being - over written at the end of the first run. - -Some compset need to be updated or removed from testing. - -Some CICE tests need to have the test mods updated. - -PET_PM tests fail with MOM. - -Some CAM tests are missing land surface data. - ============================================================== Tag name: cesm3_0_alpha01a Originator(s): CSEG -Date: 24 June 2024 +Date: 21 June 2024 One-line Summary: git-fleximod and remove externals for CESM3 components/cam https://github.com/ESCOMP/CAM/cam6_3_162 ** From 1d7e7a63fd6b4cc0136b3c23dc5b674d046342ef Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Wed, 7 Aug 2024 10:53:21 -0600 Subject: [PATCH 02/33] Update compsets to use MARBL --- cime_config/config_compsets.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 984cf2863..dc06c77c4 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -40,43 +40,43 @@ B1850C_LSC - 1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + 1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV BHISTC_LSC - HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV B1850C_MSC - 1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + 1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV BHISTC_MSC - HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV BLT1850 - 1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + 1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV BLTHIST - HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV BMT1850 - 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV BMTHIST - HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV From df46bbe5b9424e4b89b8f4176ac1a5c32a0dbdcc Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Wed, 7 Aug 2024 11:15:37 -0600 Subject: [PATCH 03/33] Remove POP and cheyenne layouts Also changed existing MOM6 layouts to explicitly look for non-MARBL configuration --- cime_config/config_pes.xml | 986 +------------------------------------ 1 file changed, 4 insertions(+), 982 deletions(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 3a6a62446..7a53e6c3d 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -42,7 +42,7 @@ - + 20 ypd/ 7100 pe-hrs/simyr expected 5400 @@ -75,7 +75,7 @@ 0 - + 13.9 ypd/ 5300 pe-hrs/simyr expected 2700 @@ -108,7 +108,7 @@ 0 - + 10 ypd/ 5100 pe-hrs/simyr expected 1920 @@ -141,7 +141,7 @@ 0 - + 2.9 ypd/ 4185 pe-hrs/simyr expected 448 @@ -177,984 +177,6 @@ - - - - none - - -4 - -2 - -2 - -2 - -2 - -1 - -1 - -4 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -2 - -4 - 0 - 0 - 0 - - - - - - - - - - -8 - -3 - -3 - -5 - -8 - 64 - 64 - -8 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -3 - -8 - 0 - 64 - 0 - - - - - - - - none - - -8 - -8 - -8 - -8 - -8 - -8 - -8 - -8 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - - none - - -16 - -16 - -16 - -16 - -16 - -16 - -10 - -16 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - - none - - -16 - -13 - -13 - -2 - -4 - -16 - -1 - -16 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - -13 - 0 - -16 - 0 - -15 - 0 - - - - - - - - none - - 1800 - 720 - 720 - 1080 - 324 - 36 - 36 - 1800 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 720 - 1800 - 0 - 1 - 0 - - - - - - - - none - - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 - 160 - 1024 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - - none - - 1440 - 1440 - 1440 - 512 - 2048 - 1440 - 160 - 1440 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 1440 - 0 - 0 - 0 - - - - - - - - none - - 48 - 8 - 8 - 40 - 32 - 48 - 48 - 48 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 8 - 48 - 0 - 0 - 0 - - - - - - - - none - - 160 - 80 - 80 - 80 - 160 - 160 - 160 - 240 - - - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 1 - - - 0 - 0 - 0 - 80 - 0 - 0 - 160 - - - - - - - - none - - 96 - 48 - 48 - 48 - 12 - 96 - 96 - 96 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 48 - 48 - 0 - 96 - 0 - 0 - 0 - - - - - - - - none - - 192 - 72 - 72 - 120 - 24 - 192 - 160 - 192 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 120 - 120 - 0 - 192 - 0 - 0 - 0 - - - - - - - - none - - 256 - 64 - 64 - 192 - 16 - 256 - 160 - 256 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 192 - 0 - 0 - 256 - 0 - 0 - 0 - - - - - - - - none - - 240 - 40 - 40 - 200 - 20 - 240 - 160 - 240 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 240 - 0 - 0 - 240 - 0 - 0 - 0 - - - - - - - - none - - 120 - 48 - 48 - 72 - 24 - 120 - 1 - 1 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 48 - 120 - 0 - 0 - 0 - 0 - - - - - - - - none - - -8 - -4 - -4 - -4 - -1 - -8 - -2 - -8 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -4 - -8 - 0 - 0 - 0 - - - - - - - - none - - 60 - 40 - 40 - 20 - 12 - 60 - 60 - 60 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 40 - 60 - 0 - 0 - 0 - - - - - - - - - none - - 576 - 288 - 288 - 288 - 180 - 36 - 36 - 576 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 288 - 576 - 0 - 0 - 0 - - - - - none - - 1800 - 900 - 900 - 900 - 720 - 36 - 36 - 1800 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 900 - 1800 - 0 - 0 - 0 - - - - - - - - about 6.5ypd expected - - -16 - -13 - -13 - -2 - -4 - -16 - -1 - -16 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -13 - -16 - 0 - -15 - 0 - - - - - - 1152 - 864 - 864 - 252 - 36 - 1152 - 36 - 1152 - - - 3 - 3 - 3 - 3 - 3 - 3 - 3 - 3 - - - 0 - 0 - 0 - 864 - 1152 - 0 - 1116 - 0 - - - - - about 8 ypd expected - - -20 - -17 - -17 - -3 - -4 - -20 - 1 - -20 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -17 - -20 - 0 - 0 - 0 - - - - about 15ypd expected - - 1728 - 1440 - 1440 - 252 - 432 - 1728 - 36 - 1728 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 1440 - 1728 - 0 - 1692 - 0 - - - - about 25ypd expected - - -32 - -24 - -24 - -8 - 256 - -32 - 32 - -32 - - - 3 - 3 - 3 - 3 - 3 - 3 - 3 - 3 - - - 0 - 0 - 0 - -24 - -32 - 0 - 1408 - 0 - - - - - - about 6.5ypd expected - - -10 - -8 - -8 - -2 - -2 - -10 - -1 - -10 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -8 - -10 - 0 - -12 - 0 - - - - - - - - none - - 384 - 64 - 64 - 320 - 32 - 384 - 160 - 64 - - - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 1 - - - 0 - 0 - 0 - 64 - 384 - 0 - 0 - 0 - - - - - - - - none - - 1024 - 416 - 1024 - 1024 - 1024 - 1024 - 160 - 1024 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - BLT1850 + 1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + + + + BLT1850_MARBL 1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV BLTHIST - HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV + HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV BMT1850 - 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV + 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV BMTHIST - HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV + HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml index fd4aedc90..be127d560 100644 --- a/cime_config/testlist_allactive.xml +++ b/cime_config/testlist_allactive.xml @@ -133,4 +133,12 @@ + + + + + + + + From 34552ee59c68dffceec8863030996571ed08b398 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 9 Aug 2024 09:39:59 -0600 Subject: [PATCH 07/33] Remove user_nl_pop from defaultio --- cime_config/testmods_dirs/allactive/defaultio/user_nl_pop | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 cime_config/testmods_dirs/allactive/defaultio/user_nl_pop diff --git a/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop b/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop deleted file mode 100644 index 017383558..000000000 --- a/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop +++ /dev/null @@ -1,6 +0,0 @@ -& tavg_nml - ltavg_ignore_extra_streams = .true. - n_tavg_streams = 1 - tavg_freq_opt = 'nday' - tavg_file_freq_opt = 'nday' -/ From 1d2890e3bb6c5b035ff31c84e7943cf04523abdc Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 8 Aug 2024 19:51:30 -0600 Subject: [PATCH 08/33] Return describe_version to its state prior to ca22dbf I will update it to leverage git-fleximod, but want to use the more extensive python script as a starting point. --- describe_version | 72 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/describe_version b/describe_version index 1c211b8ce..33dd53518 100755 --- a/describe_version +++ b/describe_version @@ -1 +1,71 @@ -./bin/git-fleximod status +#!/usr/bin/env python +"""Describes the CESM version and any local modifications""" + +from __future__ import print_function + +import os +import argparse +import subprocess + +def commandline_args(): + """Parse and return command-line arguments + """ + + # We don't really need an argument parser, since there currently aren't any + # arguments. But providing this allows supporting a '--help' option with a + # description. + + description = """ +Script for describing the CESM version and any local modifications + +Simply run: + + ./describe_version + +without any arguments. + +You may want to redirect the output to a file, such as: + + ./describe_version > current_version.txt +""" + + parser = argparse.ArgumentParser( + description=description, + formatter_class=argparse.RawTextHelpFormatter) + + args = parser.parse_args() + return args + +def main(): + """Main function for describe_version""" + # We currently don't actually need any arguments, but call this to allow '--help' usage + _ = commandline_args() + + # Allow this script to run correctly even if invoked from some other directory; note that + # we assume that the script resides in the top level of the CESM checkout. + cesmroot = os.path.dirname(os.path.realpath(__file__)) + + separator = 72*'-' + '\n' + + # The '--long' option to git describe forces it to always show the hash, even if we're + # on a tag. + git_describe = subprocess.check_output(['git', 'describe', '--long'], + cwd=cesmroot, + universal_newlines=True) + print(separator + 'git describe:\n' + git_describe + separator) + + git_status = subprocess.check_output(['git', 'status'], + cwd=cesmroot, + universal_newlines=True) + print(separator + 'git status:\n' + git_status + separator) + + manic = os.path.join('manage_externals', 'checkout_externals') + # Give '--verbose' twice to give very verbose output, showing all modified files in + # each external. + manage_externals_status = subprocess.check_output([manic, '--status', '--verbose', '--verbose'], + cwd=cesmroot, + universal_newlines=True) + print(separator + 'manage_externals status:\n' + manage_externals_status + separator) + +if __name__ == "__main__": + main() From 3cbb02798785cc45ab5b257f0dcce104e8643252 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 8 Aug 2024 20:07:36 -0600 Subject: [PATCH 09/33] Change describe_version to use git-fleximod instead of manage_externals --- describe_version | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/describe_version b/describe_version index 33dd53518..251bd09b2 100755 --- a/describe_version +++ b/describe_version @@ -59,13 +59,11 @@ def main(): universal_newlines=True) print(separator + 'git status:\n' + git_status + separator) - manic = os.path.join('manage_externals', 'checkout_externals') - # Give '--verbose' twice to give very verbose output, showing all modified files in - # each external. - manage_externals_status = subprocess.check_output([manic, '--status', '--verbose', '--verbose'], - cwd=cesmroot, - universal_newlines=True) - print(separator + 'manage_externals status:\n' + manage_externals_status + separator) + fleximod = os.path.join('bin', 'git-fleximod') + fleximod_status = subprocess.check_output([fleximod, 'status'], + cwd=cesmroot, + universal_newlines=True) + print(separator + 'git-fleximod status:\n' + fleximod_status + separator) if __name__ == "__main__": main() From e15bd267a3e7781731a2859220b366c74de3a29b Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 9 Aug 2024 09:38:43 -0600 Subject: [PATCH 10/33] Remove unnecessary future import line --- describe_version | 2 -- 1 file changed, 2 deletions(-) diff --git a/describe_version b/describe_version index 251bd09b2..d652cd839 100755 --- a/describe_version +++ b/describe_version @@ -1,8 +1,6 @@ #!/usr/bin/env python """Describes the CESM version and any local modifications""" -from __future__ import print_function - import os import argparse import subprocess From 5c9208c48fa2920e478b00dc33a764ad890a50eb Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 9 Aug 2024 13:16:54 -0600 Subject: [PATCH 11/33] Update for cesm3_0_alpha03a --- .gitmodules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index c9571cf78..9151d855c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,14 +30,14 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.1 + fxtag = ccs_config_cesm1.0.3 fxrequired = ToplevelRequired [submodule "cime"] path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.0 + fxtag = cime6.1.8 fxrequired = ToplevelRequired [submodule "fms"] @@ -45,7 +45,7 @@ url = https://github.com/ESCOMP/FMS_interface fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface fxrequired = ToplevelRequired - fxtag = fi_240516 + fxtag = fi_240807 [submodule "share"] path = share @@ -66,7 +66,7 @@ url = https://github.com/ESCOMP/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ctsm5.2.009 + fxtag = ctsm5.2.019 [submodule "cice"] path = components/cice @@ -80,7 +80,7 @@ url = https://github.com/ESCOMP/MOM_interface fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface fxrequired = ToplevelRequired - fxtag = mi_240705 + fxtag = mi_240805 [submodule "cism"] path = components/cism @@ -94,14 +94,14 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.43 + fxtag = cdeps1.0.45 [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git fxrequired = ToplevelRequired - fxtag = cmeps1.0.6 + fxtag = cmeps1.0.13 [submodule "rtm"] path = components/rtm From 312eb79042d536925dd500be81c46fbf8221bd36 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 9 Aug 2024 13:39:20 -0600 Subject: [PATCH 12/33] Add MARBL support for BMT --- cime_config/config_compsets.xml | 5 +++++ cime_config/config_pes.xml | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 6cfa26a7c..4ec432ef3 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -58,6 +58,11 @@ 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV + + BMT1850_MARBL + 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV + + BMTHIST HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 8b7b14e3e..9396a04d8 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -75,6 +75,39 @@ 0 + + + + 5400 + 1816 + 1816 + 3584 + 1816 + 4 + 1 + 5400 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 3584 + 3584 + 0 + 5400 + 0 + 0 + 0 + + 20 ypd/ 7100 pe-hrs/simyr expected From c50984f1137a0362a0fad4ce0ba1a6a6da9b1e45 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 9 Aug 2024 15:20:04 -0600 Subject: [PATCH 13/33] Small task count reduction for BMT_MARBL Noticed that the total core count requested didn't divide evenly over 128-core nodes, so dropped NTASKS_OCN by 48 --- cime_config/config_pes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 9396a04d8..038b6da21 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -82,7 +82,7 @@ 1816 1816 3584 - 1816 + 1768 4 1 5400 From 5023896c1847ed3ed21bc6083b2d9a4448e79a15 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 9 Aug 2024 15:21:27 -0600 Subject: [PATCH 14/33] use ccs_config_cesm1.0.4 --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9151d855c..7163909db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,7 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.3 + fxtag = ccs_config_cesm1.0.4 fxrequired = ToplevelRequired [submodule "cime"] From 56b20241a199f2f8bbbb6bc415e6bc7871b8dbda Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 14 Aug 2024 11:18:19 -0600 Subject: [PATCH 15/33] fix for git worktree issue --- git_fleximod/submodule.py | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/git_fleximod/submodule.py b/git_fleximod/submodule.py index 70a3018a4..da4d74a70 100644 --- a/git_fleximod/submodule.py +++ b/git_fleximod/submodule.py @@ -219,7 +219,15 @@ def sparse_checkout(self): gitroot = superroot.strip() else: gitroot = self.root_dir.strip() - assert os.path.isdir(os.path.join(gitroot, ".git")) + # Now need to move the .git dir to the submodule location + rootdotgit = os.path.join(self.root_dir, ".git") + while os.path.isfile(rootdotgit): + with open(rootdotgit) as f: + line = f.readline() + if line.startswith("gitdir: "): + rootdotgit = os.path.abspath(os.path.join(self.root_dir,line[8:].rstrip())) + print(f"rootdotgit is {rootdotgit}") + assert os.path.isdir(rootdotgit) # first create the module directory if not os.path.isdir(os.path.join(self.root_dir, self.path)): os.makedirs(os.path.join(self.root_dir, self.path)) @@ -256,35 +264,33 @@ def sparse_checkout(self): os.path.join(self.root_dir, f.read().split()[1]), start=os.path.join(self.root_dir, self.path), ) - topgit = os.path.join(gitpath, "modules") + rootdotgit = os.path.join(gitpath, "modules", self.name) else: - topgit = os.path.relpath( - os.path.join(self.root_dir, ".git", "modules"), + rootdotgit = os.path.relpath( + os.path.join(self.root_dir, ".git", "modules", self.name), start=os.path.join(self.root_dir, self.path), ) - with utils.pushd(sprep_repo): - if not os.path.isdir(topgit): - os.makedirs(topgit) - topgit += os.sep + self.name - if os.path.isdir(os.path.join(self.root_dir, self.path, ".git")): with utils.pushd(sprep_repo): - if os.path.isdir(os.path.join(topgit,".git")): - shutil.rmtree(os.path.join(topgit,".git")) - shutil.move(".git", topgit) + if os.path.isdir(os.path.join(rootdotgit,".git")): + shutil.rmtree(os.path.join(rootdotgit,".git")) + shutil.move(".git", rootdotgit) with open(".git", "w") as f: - f.write("gitdir: " + os.path.relpath(topgit)) - # assert(os.path.isdir(os.path.relpath(topgit, start=sprep_repo))) - gitsparse = os.path.abspath(os.path.join(topgit, "info", "sparse-checkout")) + f.write("gitdir: " + os.path.relpath(rootdotgit)) + infodir = os.path.join(rootdotgit, "info") + if not os.path.isdir(infodir): + os.makedirs(infodir) + gitsparse = os.path.abspath(os.path.join(infodir, "sparse-checkout")) if os.path.isfile(gitsparse): self.logger.warning( - "submodule {} is already initialized {}".format(self.name, topgit) + "submodule {} is already initialized {}".format(self.name, rootdotgit) ) return with utils.pushd(sprep_repo): if os.path.isfile(self.fxsparse): + shutil.copy(self.fxsparse, gitsparse) From 4749ece44614abb543007e20552351169c02a7d6 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 14 Aug 2024 11:26:36 -0600 Subject: [PATCH 16/33] remove debug print statement --- git_fleximod/submodule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_fleximod/submodule.py b/git_fleximod/submodule.py index da4d74a70..f8e235dee 100644 --- a/git_fleximod/submodule.py +++ b/git_fleximod/submodule.py @@ -226,7 +226,7 @@ def sparse_checkout(self): line = f.readline() if line.startswith("gitdir: "): rootdotgit = os.path.abspath(os.path.join(self.root_dir,line[8:].rstrip())) - print(f"rootdotgit is {rootdotgit}") + assert os.path.isdir(rootdotgit) # first create the module directory if not os.path.isdir(os.path.join(self.root_dir, self.path)): From 532c2443ba138209e36b7294ebbfd0dd61e0effc Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 14 Aug 2024 11:29:55 -0600 Subject: [PATCH 17/33] Bump to 0.8.5 --- git_fleximod/cli.py | 2 +- pyproject.toml | 2 +- tbump.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index b6f728f88..7e4f9c094 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.8.4" +__version__ = "0.8.5" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/pyproject.toml b/pyproject.toml index 850e57d59..97bb9ac52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.8.4" +version = "0.8.5" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/tbump.toml b/tbump.toml index bd82c557a..dd6ec3f03 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.8.4" +current = "0.8.5" # Example of a semver regexp. # Make sure this matches current_version before From 5cfc1053a2973b3db924a09737d9d3c7c59f349d Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 14 Aug 2024 11:49:17 -0600 Subject: [PATCH 18/33] update submodules --- .gitmodules | 14 +++++++------- ccs_config | 2 +- cime | 2 +- components/cdeps | 2 +- components/clm | 2 +- components/cmeps | 2 +- components/mom | 2 +- libraries/FMS | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitmodules b/.gitmodules index c9571cf78..7163909db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,14 +30,14 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.1 + fxtag = ccs_config_cesm1.0.4 fxrequired = ToplevelRequired [submodule "cime"] path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.0 + fxtag = cime6.1.8 fxrequired = ToplevelRequired [submodule "fms"] @@ -45,7 +45,7 @@ url = https://github.com/ESCOMP/FMS_interface fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface fxrequired = ToplevelRequired - fxtag = fi_240516 + fxtag = fi_240807 [submodule "share"] path = share @@ -66,7 +66,7 @@ url = https://github.com/ESCOMP/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ctsm5.2.009 + fxtag = ctsm5.2.019 [submodule "cice"] path = components/cice @@ -80,7 +80,7 @@ url = https://github.com/ESCOMP/MOM_interface fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface fxrequired = ToplevelRequired - fxtag = mi_240705 + fxtag = mi_240805 [submodule "cism"] path = components/cism @@ -94,14 +94,14 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.43 + fxtag = cdeps1.0.45 [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git fxrequired = ToplevelRequired - fxtag = cmeps1.0.6 + fxtag = cmeps1.0.13 [submodule "rtm"] path = components/rtm diff --git a/ccs_config b/ccs_config index 97ee0d2ca..e2a542212 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 97ee0d2ca1d1a4066a492cedcafe380ad5ccc6ad +Subproject commit e2a542212c4a1aff5ac7d55544ecc6eb8c495c93 diff --git a/cime b/cime index fcb9c6ec1..f89e7a2da 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit fcb9c6ec1e15f2f33995cf247aef3f8ef9f121eb +Subproject commit f89e7a2dae2af669fd60aead591e17fdc4f5cbf4 diff --git a/components/cdeps b/components/cdeps index 453a9d175..46c10740c 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 453a9d175a5739d9cca5c4ec7b96f45b201decec +Subproject commit 46c10740ce83a154edfc876093f72e7f041c3659 diff --git a/components/clm b/components/clm index e04b7e2ee..289913e55 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit e04b7e2ee974aaef93117776a96fd7ce1e774b4d +Subproject commit 289913e55b07e99abeef3ee5688981ec6cc5ae28 diff --git a/components/cmeps b/components/cmeps index 452005149..e71a5aa81 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 452005149deea59768410c296b09b8457fd06bcd +Subproject commit e71a5aa81e31f2fd996cb79dd3390fdc213f35e8 diff --git a/components/mom b/components/mom index 7b33fdbff..7cbb891c7 160000 --- a/components/mom +++ b/components/mom @@ -1 +1 @@ -Subproject commit 7b33fdbffe31dfa9db9ec61d310596b580c01dbb +Subproject commit 7cbb891c7aaffb4f9e806a5fef668bd725d95d3c diff --git a/libraries/FMS b/libraries/FMS index 270433531..fdfeff74a 160000 --- a/libraries/FMS +++ b/libraries/FMS @@ -1 +1 @@ -Subproject commit 270433531d33c64da7944d80564fe39a84917d26 +Subproject commit fdfeff74ae7d0147b6499e732a5b0f2c5a39fbc1 From 25fa166cb04987b651da6784863336e405942706 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 15 Aug 2024 11:48:29 -0600 Subject: [PATCH 19/33] update pelayouts and add append option, requires cime 4664 --- cime_config/config_compsets.xml | 5 ++++ cime_config/config_pes.xml | 49 ++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 6cfa26a7c..4f645910c 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -48,6 +48,11 @@ 1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV + + BMT1850_MARBL + 1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV + + BLTHIST HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 8b7b14e3e..433dcc94b 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -49,7 +49,7 @@ 1816 1816 3584 - 408 + 488 4 1 5400 @@ -108,6 +108,43 @@ 0 + + + + + + + + 5400 + 1792 + 1792 + 3608 + 3300 + 4 + 1 + 5400 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 1792 + 5404 + 5400 + 5400 + 0 + + 20 ypd/ 10500 pe-hrs/simyr expected @@ -369,5 +406,15 @@ + + + + '-pcols 9' + + + '-pcols 9' + + + From 01a07c235192383c2805effca79385d43da76ecd Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Thu, 15 Aug 2024 13:08:35 -0600 Subject: [PATCH 20/33] Update for cesm3_0_alpha03a --- ChangeLog | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/ChangeLog b/ChangeLog index 270f38470..8d7e3f960 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,197 @@ +============================================================== +Tag name: cesm3_0_alpha03a +Originator(s): CSEG +Date: 15 August 2024 +One-line Summary: CTSM answer changing tag + +components/cam https://github.com/ESCOMP/CAM/cam6_4_016 -- +components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_12 -- +cime https://github.com/ESMCI/cime/tree/cime6.1.8 ** +share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 -- +ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.4 ** +components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.13 ** +components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.45 ** +components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 -- +components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.2.019 ** +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240807 ** +components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 -- +components/mom https://github.com/ESCOMP/MOM_interface/mi_240805 ** +components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 -- +components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 -- +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.2 -- +libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_2 -- + +ccs_config + James Edwards 2024-08-09 - ccs_config_cesm1.0.4 - ccs_config (cesm3_0_alpha03a) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.4 + + Completes the reformatting of config_batch.xml and cmake_macros, seperating machine specific entries into machine specific directories. Depends on cime6.1.8 + + + James Edwards 2024-08-01 - ccs_config_cesm1.0.3 - ccs_config (cesm3_0_alpha03a) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.3 + + updates some modules and depends files for derecho + + +cdeps + Chris Fischer 2024-08-09 - cdeps1.0.45 - components/cdeps (cesm3_0_alpha03a) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.45 + + cdeps1.0.45: Fix/cdeps build concurancy + cdeps1.0.44: Add capability to send both prescribed SST and multi-level ocean SST/SALN to mediator + + +cesm + Michael Levy 2024-08-06 - ??? - (cesm3_0_alpha03a) + https://github.com/ESCOMP/cesm/tags/??? + + Update config_pes.xml for Derecho to add support for compsets with MOM6+MARBL + Turn MARBL tracers on by default in fully-coupled compsets + Any compset that goes from _MOM6_ -> _MOM6%MARBL-BIO_ will change answers (MARBL feeds back to ocean, and also increases NTASKS_OCN) + + requires MOM tag mi_240805 (or later) to actually turn MARBL on + + +cime + James Edwards 2024-08-09 - cime6.1.8 - cime (cesm3_0_alpha03a) + https://github.com/ESMCI/cime/tags/cime6.1.8 + + Support ccs_config reformatting. + + +clm + Erik Kluzek 2024-07-23 - ctsm5.2.019 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.XXX + + Add option for Leung_2023 dust emissions + + + Erik Kluzek 2024-07-23 - ctsm5.2.018 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.XXX + + Fix for excess ice cold starts + + + Erik Kluzek 2024-07-23 - ctsm5.2.017 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.XXX + + Move control of dust emissions to the dust_emis_inparm namelist + in drv_flds_in with CMEPS code. + + + Erik Kluzek 2024-07-23 - ctsm5.2.016 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.XXX + + Crop calendar updates for clm6_0 physics. + + Changes answers for Clm60BgcCrop compsets + + + Erik Kluzek 2024-07-16 - ctsm5.2.015 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.015 + + Update externals for: MOSART, RTM, CISM, CMEPS (versions from cesm3_0_alpha02a) + With CISM runoff going to the ROF model directly + + + Erik Kluzek 2024-07-16 - ctsm5.2.014 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.014 + + Bring in CN-Matrix which provides faster spinup of BGC + + Answers are different only when turned on, and the main usage for it on is for spinup + + + Erik Kluzek 2024-07-16 - ctsm5.2.013 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.013 + + Updates of FATES LUH2 version 2 + Changes answers just for FATES compsets + + + Erik Kluzek 2024-07-16 - ctsm5.2.012 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.012 + + Relax tolerance for truncating small snocan values in CanopyFluxes + + + Erik Kluzek 2024-07-16 - ctsm5.2.011 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.011 + + Merge b4b-dev: + - Remove use_dynroots + - Change NEON NIWO test to HARV + - Fix py_env_create + + + Erik Kluzek 2024-07-16 - ctsm5.2.010 - components/clm (cesm3_0_alpha03a) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.010 + + Explicit A/C adoption as a new option (turned off for now). + + +cmeps + Michael Levy 2024-08-06 - cmeps1.0.12 - src/drivers/nuopc/ (cesm3_0_alpha03a) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.? + + Update default values for CCSM_BGC and CCSM_CO2_PPMV when running MOM6 + MARBL + Remove all POP2-specific values from config_component_cesm.xml + + + James Edwards 2024-08-01 - cmeps1.0.6 - src/drivers/nuopc/ (cesm3_0_alpha03a) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.6 + + fix an error in the aoflux wind_gust fields + + + Chris Fischer 2024-08-09 - cmeps1.0.13 - src/drivers/nuopc/ (cesm3_0_alpha03a) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.13 + + Simplify logic for glc_renormalize_smb. Changes answers for T compsets + + +fms + Michael Levy 2024-08-06 - fi_240807 - libraries/fms (cesm3_0_alpha03a) + https://github.com/ESCOMP/FMS_interface/tags/fi_2408?? + + Increase max number of fields per file so MOM6 can write all the MARBL diagnostics out in the test suite + + + Alper Altuntas 2024-08-06 - fi_240806 - libraries/fms (cesm3_0_alpha03a) + https://github.com/ESCOMP/FMS_interface/tags/fi_240806 + + fix issue with using compset longname in cesm testing + + +mom + Michael Levy 2024-08-02 - mi_240805 - components/mom (cesm3_0_alpha03a) + https://github.com/ESCOMP/MOM_interface/tags/mi_240802 + + Add MARBL driver + + Needs FMS tag fi_240807 for MARBL tests to run successfully; also needs CMEPS tag ??? to get CO2 right + + + Michael Levy 2024-08-02 - mi_240730 - components/mom (cesm3_0_alpha03a) + https://github.com/ESCOMP/MOM_interface/tags/mi_240730 + + Two MOM6 updates: + + 1. KE-conserving correction to velocity remap + 2. Stochastic GM+E + + Also some interface changes: + + 1. Update ocean_geometry entry for multi-instance + 2. Update compsets and grids (and test list, to reflect new compset names and remove tests on old grids) + 3. Added new stochastic_physics external that can be built with MOM6 + + bit-for-bit is a tricky question... the G_JRA compset should be bfb with the GMOM_JRA compset used in previous tags + Saying "all" because I think if you stick with an identical compset long-name then it will be bfb + + + ============================================================== Tag name: cesm3_0_beta02 Originator(s): CSEG From 7825f2958b18591c311a2d8d50d824331d1e5004 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 16 Aug 2024 10:28:26 -0600 Subject: [PATCH 21/33] update to provide warning --- git_fleximod/utils.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/git_fleximod/utils.py b/git_fleximod/utils.py index 1a2d5ccf2..eef15113a 100644 --- a/git_fleximod/utils.py +++ b/git_fleximod/utils.py @@ -307,12 +307,15 @@ def execute_subprocess(commands, status_to_caller=False, output_to_caller=False) # simple status check. If returning, it is the callers # responsibility determine if an error occurred and handle it # appropriately. - if not return_to_caller: - msg_context = ( - "Process did not run successfully; " - "returned status {0}".format(error.returncode) - ) - msg = failed_command_msg(msg_context, commands, output=error.output) + msg_context = ( + "Process did not run successfully; " + "returned status {0}".format(error.returncode) + ) + msg = failed_command_msg(msg_context, commands, output=error.output) + if return_to_caller: + logging.warning(error) + logging.warning(msg) + else: logging.error(error) logging.error(msg) log_process_output(error.output) From d826532842e9205d358fe963223d55de664d451c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 16 Aug 2024 11:04:38 -0600 Subject: [PATCH 22/33] better error checks --- git_fleximod/git_fleximod.py | 6 ++-- git_fleximod/gitinterface.py | 5 ++-- git_fleximod/submodule.py | 55 ++++++++++++++++++++---------------- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/git_fleximod/git_fleximod.py b/git_fleximod/git_fleximod.py index 50e0ef83d..0851e9d09 100755 --- a/git_fleximod/git_fleximod.py +++ b/git_fleximod/git_fleximod.py @@ -124,8 +124,8 @@ def submodule_sparse_checkout(root_dir, name, url, path, sparsefile, tag="master # set the repository remote logger.info("Setting remote origin in {}/{}".format(root_dir, path)) - status = sprepo_git.git_operation("remote", "-v") - if url not in status: + _, remotelist = sprepo_git.git_operation("remote", "-v") + if url not in remotelist: sprepo_git.git_operation("remote", "add", "origin", url) topgit = os.path.join(gitroot, ".git") @@ -213,7 +213,7 @@ def submodules_status(gitmodules, root_dir, toplevel=False, depth=0): def git_toplevelroot(root_dir, logger): rgit = GitInterface(root_dir, logger) - superroot = rgit.git_operation("rev-parse", "--show-superproject-working-tree") + _, superroot = rgit.git_operation("rev-parse", "--show-superproject-working-tree") return superroot def submodules_update(gitmodules, root_dir, requiredlist, force): diff --git a/git_fleximod/gitinterface.py b/git_fleximod/gitinterface.py index 583120144..f0dc19090 100644 --- a/git_fleximod/gitinterface.py +++ b/git_fleximod/gitinterface.py @@ -59,11 +59,12 @@ def git_operation(self, operation, *args, **kwargs): command = self._git_command(operation, *newargs) if isinstance(command, list): try: - return utils.execute_subprocess(command, output_to_caller=True) + status, output = utils.execute_subprocess(command, status_to_caller=True, output_to_caller=True) + return status, output.rstrip() except Exception as e: sys.exit(e) else: - return command + return 0, command def config_get_value(self, section, name): if self._use_module: diff --git a/git_fleximod/submodule.py b/git_fleximod/submodule.py index f8e235dee..2c709e52b 100644 --- a/git_fleximod/submodule.py +++ b/git_fleximod/submodule.py @@ -60,8 +60,8 @@ def status(self): if not os.path.exists(os.path.join(smpath, ".git")): rootgit = GitInterface(self.root_dir, self.logger) # submodule commands use path, not name - tags = rootgit.git_operation("ls-remote", "--tags", self.url) - result = rootgit.git_operation("submodule","status",smpath).split() + status, tags = rootgit.git_operation("ls-remote", "--tags", self.url) + status, result = rootgit.git_operation("submodule","status",smpath).split() if result: ahash = result[0][1:] @@ -80,9 +80,9 @@ def status(self): result = f"e {self.name:>20} not checked out, aligned at tag {self.fxtag}{optional}" needsupdate = True elif self.fxtag: - ahash = rootgit.git_operation( + status, ahash = rootgit.git_operation( "submodule", "status", "{}".format(self.path) - ).rstrip() + ) ahash = ahash[1 : len(self.fxtag) + 1] if self.fxtag == ahash: result = f"e {self.name:>20} not checked out, aligned at hash {ahash}{optional}" @@ -96,14 +96,15 @@ def status(self): else: with utils.pushd(smpath): git = GitInterface(smpath, self.logger) - remote = git.git_operation("remote").rstrip() + status, remote = git.git_operation("remote") if remote == '': result = f"e {self.name:>20} has no associated remote" testfails = True needsupdate = True return result, needsupdate, localmods, testfails - rurl = git.git_operation("ls-remote","--get-url").rstrip() - line = git.git_operation("log", "--pretty=format:\"%h %d\"").partition('\n')[0] + status, rurl = git.git_operation("ls-remote","--get-url") + status, lines = git.git_operation("log", "--pretty=format:\"%h %d\"") + line = lines.partition('\n')[0] parts = line.split() ahash = parts[0][1:] atag = None @@ -120,7 +121,7 @@ def status(self): #print(f"line is {line} ahash is {ahash} atag is {atag} {parts}") - # atag = git.git_operation("describe", "--tags", "--always").rstrip() + # atag = git.git_operation("describe", "--tags", "--always") # ahash = git.git_operation("rev-list", "HEAD").partition("\n")[0] recurse = False @@ -149,8 +150,8 @@ def status(self): result = f"e {self.name:>20} has no fxtag defined in .gitmodules, module at {ahash}" testfails = False - status = git.git_operation("status", "--ignore-submodules", "-uno") - if "nothing to commit" not in status: + status, output = git.git_operation("status", "--ignore-submodules", "-uno") + if "nothing to commit" not in output: localmods = True result = "M" + textwrap.indent(status, " ") # print(f"result {result} needsupdate {needsupdate} localmods {localmods} testfails {testfails}") @@ -171,10 +172,11 @@ def _add_remote(self, git): Returns: str: The name of the new remote if added, or the name of the existing remote that matches the submodule's URL. """ - remotes = git.git_operation("remote", "-v").splitlines() + status, remotes = git.git_operation("remote", "-v") + remotes = remotes.splitlines() upstream = None if remotes: - upstream = git.git_operation("ls-remote", "--get-url").rstrip() + status, upstream = git.git_operation("ls-remote", "--get-url") newremote = "newremote.00" tmpurl = self.url.replace("git@github.com:", "https://github.com/") line = next((s for s in remotes if self.url in s or tmpurl in s), None) @@ -214,7 +216,7 @@ def sparse_checkout(self): """ self.logger.info("Called sparse_checkout for {}".format(self.name)) rgit = GitInterface(self.root_dir, self.logger) - superroot = rgit.git_operation("rev-parse", "--show-superproject-working-tree") + status, superroot = rgit.git_operation("rev-parse", "--show-superproject-working-tree") if superroot: gitroot = superroot.strip() else: @@ -225,7 +227,7 @@ def sparse_checkout(self): with open(rootdotgit) as f: line = f.readline() if line.startswith("gitdir: "): - rootdotgit = os.path.abspath(os.path.join(self.root_dir,line[8:].rstrip())) + rootdotgit = os.path.abspath(os.path.join(self.root_dir,line[8:])) assert os.path.isdir(rootdotgit) # first create the module directory @@ -252,8 +254,8 @@ def sparse_checkout(self): # set the repository remote self.logger.info("Setting remote origin in {}/{}".format(self.root_dir, self.path)) - status = sprepo_git.git_operation("remote", "-v") - if self.url not in status: + status, remotes = sprepo_git.git_operation("remote", "-v") + if self.url not in remotes: sprepo_git.git_operation("remote", "add", "origin", self.url) topgit = os.path.join(gitroot, ".git") @@ -296,9 +298,11 @@ def sparse_checkout(self): # Finally checkout the repo sprepo_git.git_operation("fetch", "origin", "--tags") - sprepo_git.git_operation("checkout", self.fxtag) - - print(f"Successfully checked out {self.name:>20} at {self.fxtag}") + status,_ = sprepo_git.git_operation("checkout", self.fxtag) + if status: + print(f"Error checking out {self.name:>20} at {self.fxtag}") + else: + print(f"Successfully checked out {self.name:>20} at {self.fxtag}") rgit.config_set_value(f'submodule "{self.name}"', "active", "true") rgit.config_set_value(f'submodule "{self.name}"', "url", self.url) rgit.config_set_value(f'submodule "{self.name}"', "path", self.path) @@ -348,7 +352,7 @@ def update(self): git.git_operation("clone", self.url, self.path) smgit = GitInterface(repodir, self.logger) if not tag: - tag = smgit.git_operation("describe", "--tags", "--always").rstrip() + status, tag = smgit.git_operation("describe", "--tags", "--always") smgit.git_operation("checkout", tag) # Now need to move the .git dir to the submodule location rootdotgit = os.path.join(self.root_dir, ".git") @@ -356,7 +360,7 @@ def update(self): with open(rootdotgit) as f: line = f.readline() if line.startswith("gitdir: "): - rootdotgit = line[8:].rstrip() + rootdotgit = line[8:] newpath = os.path.abspath(os.path.join(self.root_dir, rootdotgit, "modules", self.name)) if os.path.exists(newpath): @@ -399,15 +403,16 @@ def update(self): git = GitInterface(submoddir, self.logger) # first make sure the url is correct newremote = self._add_remote(git) - tags = git.git_operation("tag", "-l") + status, tags = git.git_operation("tag", "-l") fxtag = self.fxtag if fxtag and fxtag not in tags: git.git_operation("fetch", newremote, "--tags") - atag = git.git_operation("describe", "--tags", "--always").rstrip() + status, atag = git.git_operation("describe", "--tags", "--always") if fxtag and fxtag != atag: try: - git.git_operation("checkout", fxtag) - print(f"{self.name:>20} updated to {fxtag}") + status, _ = git.git_operation("checkout", fxtag) + if not status: + print(f"{self.name:>20} updated to {fxtag}") except Exception as error: print(error) From cb86f98e62831343c64d7e4166603a7d2ff929ae Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 14 Aug 2024 11:18:19 -0600 Subject: [PATCH 23/33] fix for git worktree issue --- .lib/git-fleximod/git_fleximod/submodule.py | 38 ++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/.lib/git-fleximod/git_fleximod/submodule.py b/.lib/git-fleximod/git_fleximod/submodule.py index 70a3018a4..da4d74a70 100644 --- a/.lib/git-fleximod/git_fleximod/submodule.py +++ b/.lib/git-fleximod/git_fleximod/submodule.py @@ -219,7 +219,15 @@ def sparse_checkout(self): gitroot = superroot.strip() else: gitroot = self.root_dir.strip() - assert os.path.isdir(os.path.join(gitroot, ".git")) + # Now need to move the .git dir to the submodule location + rootdotgit = os.path.join(self.root_dir, ".git") + while os.path.isfile(rootdotgit): + with open(rootdotgit) as f: + line = f.readline() + if line.startswith("gitdir: "): + rootdotgit = os.path.abspath(os.path.join(self.root_dir,line[8:].rstrip())) + print(f"rootdotgit is {rootdotgit}") + assert os.path.isdir(rootdotgit) # first create the module directory if not os.path.isdir(os.path.join(self.root_dir, self.path)): os.makedirs(os.path.join(self.root_dir, self.path)) @@ -256,35 +264,33 @@ def sparse_checkout(self): os.path.join(self.root_dir, f.read().split()[1]), start=os.path.join(self.root_dir, self.path), ) - topgit = os.path.join(gitpath, "modules") + rootdotgit = os.path.join(gitpath, "modules", self.name) else: - topgit = os.path.relpath( - os.path.join(self.root_dir, ".git", "modules"), + rootdotgit = os.path.relpath( + os.path.join(self.root_dir, ".git", "modules", self.name), start=os.path.join(self.root_dir, self.path), ) - with utils.pushd(sprep_repo): - if not os.path.isdir(topgit): - os.makedirs(topgit) - topgit += os.sep + self.name - if os.path.isdir(os.path.join(self.root_dir, self.path, ".git")): with utils.pushd(sprep_repo): - if os.path.isdir(os.path.join(topgit,".git")): - shutil.rmtree(os.path.join(topgit,".git")) - shutil.move(".git", topgit) + if os.path.isdir(os.path.join(rootdotgit,".git")): + shutil.rmtree(os.path.join(rootdotgit,".git")) + shutil.move(".git", rootdotgit) with open(".git", "w") as f: - f.write("gitdir: " + os.path.relpath(topgit)) - # assert(os.path.isdir(os.path.relpath(topgit, start=sprep_repo))) - gitsparse = os.path.abspath(os.path.join(topgit, "info", "sparse-checkout")) + f.write("gitdir: " + os.path.relpath(rootdotgit)) + infodir = os.path.join(rootdotgit, "info") + if not os.path.isdir(infodir): + os.makedirs(infodir) + gitsparse = os.path.abspath(os.path.join(infodir, "sparse-checkout")) if os.path.isfile(gitsparse): self.logger.warning( - "submodule {} is already initialized {}".format(self.name, topgit) + "submodule {} is already initialized {}".format(self.name, rootdotgit) ) return with utils.pushd(sprep_repo): if os.path.isfile(self.fxsparse): + shutil.copy(self.fxsparse, gitsparse) From 20a0cf2ec48904f2940bfa82815e5cb14b142168 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 14 Aug 2024 11:26:36 -0600 Subject: [PATCH 24/33] remove debug print statement --- .lib/git-fleximod/git_fleximod/submodule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lib/git-fleximod/git_fleximod/submodule.py b/.lib/git-fleximod/git_fleximod/submodule.py index da4d74a70..f8e235dee 100644 --- a/.lib/git-fleximod/git_fleximod/submodule.py +++ b/.lib/git-fleximod/git_fleximod/submodule.py @@ -226,7 +226,7 @@ def sparse_checkout(self): line = f.readline() if line.startswith("gitdir: "): rootdotgit = os.path.abspath(os.path.join(self.root_dir,line[8:].rstrip())) - print(f"rootdotgit is {rootdotgit}") + assert os.path.isdir(rootdotgit) # first create the module directory if not os.path.isdir(os.path.join(self.root_dir, self.path)): From 917ef0369f8e4afad0063a726763dc7ee8dbf75f Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 14 Aug 2024 11:29:55 -0600 Subject: [PATCH 25/33] Bump to 0.8.5 --- .lib/git-fleximod/git_fleximod/cli.py | 2 +- .lib/git-fleximod/pyproject.toml | 2 +- .lib/git-fleximod/tbump.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.lib/git-fleximod/git_fleximod/cli.py b/.lib/git-fleximod/git_fleximod/cli.py index b6f728f88..7e4f9c094 100644 --- a/.lib/git-fleximod/git_fleximod/cli.py +++ b/.lib/git-fleximod/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.8.4" +__version__ = "0.8.5" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/.lib/git-fleximod/pyproject.toml b/.lib/git-fleximod/pyproject.toml index 850e57d59..97bb9ac52 100644 --- a/.lib/git-fleximod/pyproject.toml +++ b/.lib/git-fleximod/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.8.4" +version = "0.8.5" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/.lib/git-fleximod/tbump.toml b/.lib/git-fleximod/tbump.toml index bd82c557a..dd6ec3f03 100644 --- a/.lib/git-fleximod/tbump.toml +++ b/.lib/git-fleximod/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.8.4" +current = "0.8.5" # Example of a semver regexp. # Make sure this matches current_version before From dada084f27a536c80b954d12808af254aca0d0b2 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 19 Aug 2024 09:54:18 -0600 Subject: [PATCH 26/33] more changes to add status --- git_fleximod/submodule.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git_fleximod/submodule.py b/git_fleximod/submodule.py index 2c709e52b..30a53f00f 100644 --- a/git_fleximod/submodule.py +++ b/git_fleximod/submodule.py @@ -61,7 +61,8 @@ def status(self): rootgit = GitInterface(self.root_dir, self.logger) # submodule commands use path, not name status, tags = rootgit.git_operation("ls-remote", "--tags", self.url) - status, result = rootgit.git_operation("submodule","status",smpath).split() + status, result = rootgit.git_operation("submodule","status",smpath) + result = result.split() if result: ahash = result[0][1:] @@ -153,7 +154,7 @@ def status(self): status, output = git.git_operation("status", "--ignore-submodules", "-uno") if "nothing to commit" not in output: localmods = True - result = "M" + textwrap.indent(status, " ") + result = "M" + textwrap.indent(output, " ") # print(f"result {result} needsupdate {needsupdate} localmods {localmods} testfails {testfails}") return result, needsupdate, localmods, testfails @@ -225,10 +226,9 @@ def sparse_checkout(self): rootdotgit = os.path.join(self.root_dir, ".git") while os.path.isfile(rootdotgit): with open(rootdotgit) as f: - line = f.readline() + line = f.readline().rstrip() if line.startswith("gitdir: "): rootdotgit = os.path.abspath(os.path.join(self.root_dir,line[8:])) - assert os.path.isdir(rootdotgit) # first create the module directory if not os.path.isdir(os.path.join(self.root_dir, self.path)): From b85ce7b7cb69841066ed11b1f9a140c87962c865 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 19 Aug 2024 10:07:26 -0600 Subject: [PATCH 27/33] Bump to 0.9.0 --- git_fleximod/cli.py | 2 +- pyproject.toml | 2 +- tbump.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git_fleximod/cli.py b/git_fleximod/cli.py index 7e4f9c094..085508390 100644 --- a/git_fleximod/cli.py +++ b/git_fleximod/cli.py @@ -2,7 +2,7 @@ import argparse from git_fleximod import utils -__version__ = "0.8.5" +__version__ = "0.9.0" def find_root_dir(filename=".gitmodules"): """ finds the highest directory in tree diff --git a/pyproject.toml b/pyproject.toml index 97bb9ac52..ecd1ac0f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "git-fleximod" -version = "0.8.5" +version = "0.9.0" description = "Extended support for git-submodule and git-sparse-checkout" authors = ["Jim Edwards "] maintainers = ["Jim Edwards "] diff --git a/tbump.toml b/tbump.toml index dd6ec3f03..236c90aad 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/jedwards4b/git-fleximod/" [version] -current = "0.8.5" +current = "0.9.0" # Example of a semver regexp. # Make sure this matches current_version before From 4ce2becce0386262b9b4fd79b5f3568c1e942d59 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Thu, 29 Aug 2024 12:14:13 -0600 Subject: [PATCH 28/33] Update for cesm3_0_alpha03b --- .gitmodules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7163909db..0a0c18fea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,14 +30,14 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.4 + fxtag = ccs_config_cesm1.0.5 fxrequired = ToplevelRequired [submodule "cime"] path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.8 + fxtag = cime6.1.20 fxrequired = ToplevelRequired [submodule "fms"] @@ -45,7 +45,7 @@ url = https://github.com/ESCOMP/FMS_interface fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface fxrequired = ToplevelRequired - fxtag = fi_240807 + fxtag = fi_240828 [submodule "share"] path = share @@ -66,7 +66,7 @@ url = https://github.com/ESCOMP/CTSM fxDONOTUSEurl = https://github.com/ESCOMP/CTSM fxrequired = ToplevelRequired - fxtag = ctsm5.2.019 + fxtag = ctsm5.2.027 [submodule "cice"] path = components/cice @@ -94,14 +94,14 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.45 + fxtag = cdeps1.0.49 [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git fxrequired = ToplevelRequired - fxtag = cmeps1.0.13 + fxtag = cmeps1.0.16 [submodule "rtm"] path = components/rtm @@ -114,7 +114,7 @@ path = components/ww3 url = https://github.com/ESCOMP/WW3_interface fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface - fxtag = ww3i_0.0.2 + fxtag = ww3i_0.0.3 fxrequired = ToplevelRequired [submodule "mizuroute"] @@ -136,7 +136,7 @@ url = https://github.com/NCAR/ParallelIO fxDONOTUSEurl = https://github.com/NCAR/ParallelIO fxrequired = ToplevelRequired - fxtag = pio2_6_2 + fxtag = pio2_6_3 [submodule "mpi-serial"] path = libraries/mpi-serial From 34266b66b1c075cb78de4671ca84648486da938d Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Thu, 29 Aug 2024 15:59:55 -0600 Subject: [PATCH 29/33] Update cime tag --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 0a0c18fea..2018c59c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,7 +37,7 @@ path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.20 + fxtag = cime6.1.21 fxrequired = ToplevelRequired [submodule "fms"] From b56f26d7e6bc66a9efa5b3846a7683dade73c34c Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 30 Aug 2024 11:14:23 -0600 Subject: [PATCH 30/33] Update mom external --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2018c59c8..4ab8334e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -80,7 +80,7 @@ url = https://github.com/ESCOMP/MOM_interface fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface fxrequired = ToplevelRequired - fxtag = mi_240805 + fxtag = mi_240822 [submodule "cism"] path = components/cism From 4691eff795c017df4230d12935430c35ea321765 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 30 Aug 2024 11:22:50 -0600 Subject: [PATCH 31/33] Update cime tag --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4ab8334e2..679f56c35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,7 +37,7 @@ path = cime url = https://github.com/ESMCI/cime fxDONOTUSEurl = https://github.com/ESMCI/cime - fxtag = cime6.1.21 + fxtag = cime6.1.22 fxrequired = ToplevelRequired [submodule "fms"] From b7babe533ac303f7364ca040c4de202fb1ef501b Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 30 Aug 2024 13:30:25 -0600 Subject: [PATCH 32/33] Update ccs_config tag --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 679f56c35..4997fec46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,7 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.5 + fxtag = ccs_config_cesm1.0.6 fxrequired = ToplevelRequired [submodule "cime"] From fa2ccb9dd0c3fbdd09012e4d5383738ed31570dd Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Sun, 1 Sep 2024 23:08:28 -0600 Subject: [PATCH 33/33] Update for cesm3_0_alpha03b --- ChangeLog | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 238 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8d7e3f960..9f8cb6245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,241 @@ +============================================================== +Tag name: cesm3_0_alpha03b +Originator(s): CSEG +Date: 1st September 2024 +One-line Summary: CTSM answer changing tag + +components/cam https://github.com/ESCOMP/CAM/cam6_4_016 -- +components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_12 -- +cime https://github.com/ESMCI/cime/tree/cime6.1.22 ** +share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 -- +ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.6 ** +components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.16 ** +components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.49 ** +components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 -- +components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.2.027 ** +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240822 ** +components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 -- +components/mom https://github.com/ESCOMP/MOM_interface/mi_240822 ** +components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 -- +components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 -- +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.3 ** +libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_3 ** + +ccs_config + Chris Fischer 2024-08-30 - ccs_config_cesm1.0.6 - ccs_config (cesm3_0_alpha03b) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.6 + + Update izumi esmf library to 8.6.1. + + + James Edwards 2024-08-15 - ccs_config_cesm1.0.5 - ccs_config (cesm3_0_alpha03b) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config_cesm1.0.5 + + Removes explicit mem check for derecho. + + +cdeps + James Edwards 2024-08-22 - cdeps1.0.49 - components/cdeps (cesm3_0_alpha03b) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.49 + + Add nuopc_shr_methods.F90 to share - has no affect on cesm. + + + James Edwards 2024-08-21 - cdeps1.0.48 - components/cdeps (cesm3_0_alpha03b) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.48 + + Fox download revert + Plumber updates + + + + Chris Fischer 2024-08-22 - cdeps1.0.47 - components/cdeps (cesm3_0_alpha03b) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.47 + + Plumber updates + + + James Edwards 2024-08-15 - cdeps1.0.46 - components/cdeps (cesm3_0_alpha03b) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.46 + + bugfix for fgrg_rofi computation + + +cesm + James Edwards 2024-08-15 - cesm3_0_alpha03b - (cesm3_0_alpha03b) + https://github.com/ESCOMP/cesm/tags/??? + + Updates to pelayouts including new --append option in config_pes.xml + Depends on cime https://github.com/ESMCI/cime/pull/4664 + + +cime + James Edwards 2024-08-15 - cime6.1.14 - cime (cesm3_0_alpha03b) + https://github.com/ESMCI/cime/tags/cime6.1.? + + cime6.1.14: Support for append attribute in config_pes.xml + cime6.1.13: Fix Pylint failure + + + Chris Fischer 2024-08-30 - cime6.1.22 - cime (cesm3_0_alpha03b) + https://github.com/ESMCI/cime/tags/cime6.1.22 + + Fix for PES append feature + + + Chris Fischer 2024-08-29 - cime6.1.20 - cime (cesm3_0_alpha03b) + https://github.com/ESMCI/cime/tags/cime6.1.20 + + cime6.1.20: Fix the restart test by using ceil instead of int. + cime6.1.19: Fix black formatting + + + Chris Fischer 2024-08-29 - cime6.1.20 - cime (cesm3_0_alpha03b) + https://github.com/ESMCI/cime/tags/cime6.1.20 + + stop_n must be int + + + James Edwards 2024-08-21 - cime6.1.18 - cime (cesm3_0_alpha03b) + https://github.com/ESMCI/cime/tags/cime6.1.18 + + move computation of REST_N from config_tests.xml to SystemTests python code for more flexibility in tests. + + + James Edwards 2024-08-21 - cime6.1.17 - cime (cesm3_0_alpha03b) + https://github.com/ESMCI/cime/tags/cime6.1.17 + + cime6.1.17: Refactor ParamGen _reduce_recursive operator + cime6.1.16: Make sure the (ERI) directory exists before linking to it + cime6.1.15: Generalize _hists_match for mom6 files + + + + James Edwards 2024-08-15 - cime6.1.12 - cime (cesm3_0_alpha03b) + https://github.com/ESMCI/cime/tags/cime6.1.12 + + cime6.1.12: Adds support for git case repository. + cime6.1.11: Fixes test_sys_create_newcase.TestCreateNewcase.test_d_create_clone_new_user + cime6.1.10: Fixes detection of pfunit_path by making sure it exists + cime6.1.9: xmlchange: Add documentation for setting values with commas + + +clm + Erik Kluzek 2024-08-26 - ctsm5.2.027 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.027 + + Bring in b4b-dev branch: + + - PLUMBER2 update to ctsm5.2 datasets + - Last bit of PPE changes needed + - Fix for dust emission coupling to CAM + + (This is the tag needed for CAM to bring in dust emission updates to it) + + Depends on: cdeps1.0.47 + + + Erik Kluzek 2024-08-26 - ctsm5.2.026 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.026 + + Update clm6_0 defaults turning on A/C, excess ice and Leung_2023 dust emissions + + Also new IC files for: f09 1850 + + Changes answers for all Clm60 compsets + + + Sam Rabin 2024-08-23 - ctsm5.2.025 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.025 + + Minor fixes to newish, non-default fire methods + + + Sam Rabin 2024-08-22 - ctsm5.2.024 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.024 + + Improvements to newish, non-default fire methods + + + Sam Rabin 2024-08-16 - ctsm5.2.023 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.023 + + Minor bit-for-bit changes + + + Sam Rabin 2024-08-14 - ctsm5.2.022 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.022 + + Rework crop_calendars suite and cropMonthOutput + + Changes answers, but only in our test suites, not production runs. + + + Sam Rabin 2024-08-13 - ctsm5.2.021 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.021 + + Adding on-the-fly parameter settings for prescribed N and P in FATES. Updates FATES submodule to sci.1.77.2_api.36.0.0. + + + + + Erik Kluzek 2024-08-12 - ctsm5.2.020 - components/clm (cesm3_0_alpha03b) + https://github.com/ESCOMP/ctsm/tags/ctsm5.2.020 + + Update for MEGAN VOC's (MEGAN 2.1) + + changes answers when MEGAN is on. + + +cmeps + James Edwards 2024-08-21 - cmeps1.0.16 - src/drivers/nuopc/ (cesm3_0_alpha03b) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.16 + + Fixes the case of alarms based on nsteps when components have different individual timesteps. + + + James Edwards 2024-08-21 - cmeps1.0.15 - src/drivers/nuopc/ (cesm3_0_alpha03b) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.15 + + Fix for restart tests using DGLC. + + + James Edwards 2024-08-15 - cmeps1.0.14 - src/drivers/nuopc/ (cesm3_0_alpha03b) + https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.14 + + fix bug in med_diag_mod for ice runoff + + +fms + Michael Levy 2024-08-28 - fi_240828 - libraries/fms (cesm3_0_alpha03b) + https://github.com/ESCOMP/FMS_interface/tags/fi_240828 + + Sync libraries/fms/src submodule with what is in git-fleximod + (won't change CESM checkout, except libraries/FMS will look clean to git) + + +mom + Chris Fischer 2024-08-30 - mi_240822 - components/mom (cesm3_0_alpha03b) + https://github.com/ESCOMP/MOM_interface/tags/mi_240822 + + In cime6.1.12 the location of append_status was moved in cime to avoid a circular dependency. + + +ParallelIO + James Edwards 2024-08-22 - pio2_6_3 - libraries/parallelio (cesm3_0_alpha03b) + https://github.com/NCAR/ParallelIO/tags/pio2_6_3 + + Removes an error in DEBUG mode. + + +ww3 + Alper Altuntas 2024-08-06 - ww3i_0.0.3 - components/ww3 (cesm3_0_alpha03b) + https://github.com/ESCOMP/WW3_interface/tags/ww3i_0.0.3 + + Add/remove grids, update tests and namelists + fix GNU debug failure + ice attenuation. + ============================================================== Tag name: cesm3_0_alpha03a Originator(s): CSEG