resolve conflicts with alpha2a created

ESCOMP · Jul 22, 2024 · 6403354 · 6403354
2 parents 611db33 + 5026d6a
commit 6403354
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -66,7 +66,7 @@
 	url = https://github.com/ESCOMP/CTSM
 	fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
         fxrequired = ToplevelRequired
-        fxtag = ctsm5.2.007
+        fxtag = ctsm5.2.009
 
 [submodule "cice"]
 	path = components/cice
@@ -101,7 +101,7 @@
 	url = https://github.com/ESCOMP/CMEPS.git
 	fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
         fxrequired = ToplevelRequired
-        fxtag = cmeps1.0.1
+        fxtag = cmeps1.0.2
 
 [submodule "rtm"]
 	path = components/rtm
@@ -152,7 +152,3 @@
         fxrequired = ToplevelRequired
         fxtag = 3.2.2
 
-
-
-
-
diff --git a/components/cism b/components/cism
diff --git a/components/clm b/components/clm
diff --git a/components/cmeps b/components/cmeps
+0 −107		.lib/git-fleximod/CODE_OF_CONDUCT.md
+8 −18		.lib/git-fleximod/git_fleximod/cli.py
+315 −76		.lib/git-fleximod/git_fleximod/git_fleximod.py
+1 −5		.lib/git-fleximod/git_fleximod/gitinterface.py
+2 −2		.lib/git-fleximod/git_fleximod/gitmodules.py
+0 −397		.lib/git-fleximod/git_fleximod/submodule.py
+6 −6		.lib/git-fleximod/git_fleximod/utils.py
+58 −58		.lib/git-fleximod/poetry.lock
+1 −1		.lib/git-fleximod/pyproject.toml
+1 −1		.lib/git-fleximod/tbump.toml
+4 −16		.lib/git-fleximod/tests/conftest.py
+7 −6		.lib/git-fleximod/tests/test_d_complex.py
+0 −69		.lib/git-fleximod/tests/test_e_complex_update.py
+1 −1		bld/CLMBuildNamelist.pm
+61 −37		bld/namelist_files/namelist_defaults_ctsm.xml
+11 −11		bld/unit_testers/build-namelist_test.pl
+36 −32		cime_config/config_component.xml
+1 −1		cime_config/testdefs/ExpectedTestFails.xml
+40 −39		cime_config/testdefs/testlist_clm.xml
+0 −1		cime_config/testdefs/testmods_dirs/clm/clm60cam6LndTuningModeCiso/include_user_mods
+0 −5		cime_config/testdefs/testmods_dirs/clm/clm60cam6LndTuningModeCiso/user_nl_clm
+0 −1		cime_config/testdefs/testmods_dirs/clm/clm60cam6LndTuningModeZDustSoilErod/include_user_mods
+0 −3		cime_config/testdefs/testmods_dirs/clm/clm60cam6LndTuningModeZDustSoilErod/user_nl_clm
+0 −1		cime_config/testdefs/testmods_dirs/clm/clm60cam6LndTuningMode_1979Start/include_user_mods
+0 −1		cime_config/testdefs/testmods_dirs/clm/clm60cam6LndTuningMode_2013Start/include_user_mods
+1 −0		cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/include_user_mods
+5 −0		cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/shell_commands
+1 −0		cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode_1979Start/include_user_mods
+0 −0		cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode_1979Start/shell_commands
+1 −0		cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode_2013Start/include_user_mods
+0 −0		cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode_2013Start/shell_commands
+94 −0		doc/ChangeLog
+1 −0		doc/ChangeSum
+13 −2		cime_config/namelist_definition_drv.xml
+38 −17		mediator/med_phases_post_rof_mod.F90