Merge pull request #32 from darincomeau/icepack-integration-merge-202…

…30920 Icepack integration merge 20230920
E3SM-Project · Sep 22, 2023 · 9ed8e48 · 9ed8e48
2 parents f7365e5 + f35b39c
commit 9ed8e48
Show file tree

Hide file tree

Showing 826 changed files with 62,916 additions and 14,067 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -8,10 +8,6 @@
 [submodule "sbetr"]
 	path = components/elm/src/external_models/sbetr
 	url = git@github.com:BeTR-biogeochemistry-modeling/sbetr.git
-[submodule "externals/kokkos"]
-	path = externals/kokkos
-	url = git@github.com:E3SM-Project/kokkos.git
-	branch = e3sm/kokkos
 [submodule "rrtmgp"]
 	path = components/eam/src/physics/rrtmgp/external
 	url = git@github.com:E3SM-Project/rte-rrtmgp.git
@@ -77,3 +73,10 @@
 [submodule "components/mpas-seaice/src/icepack"]
 	path = components/mpas-seaice/src/icepack
 	url = git@github.com:E3SM-Project/Icepack.git
+[submodule "externals/haero"]
+	path = externals/haero
+	url = git@github.com:eagles-project/haero.git
+[submodule "externals/mam4xx"]
+	path = externals/mam4xx
+	url = git@github.com:eagles-project/mam4xx.git
+
diff --git a/cime b/cime
diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml
@@ -44,6 +44,16 @@
   <lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>WCYCL1850_chemUCI-Linozv3</alias>
+  <lname>1850SOI_EAM%CHEMUCI-LINOZV3_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>WCYCL1850_chemUCI-Linozv3-mam5</alias>
+  <lname>1850SOI_EAM%CHEMUCI-LINOZV3-MAM5_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>WCYCL1850-1pctCO2</alias>
   <lname>1850SOI_EAM%CMIP6-1pctCO2_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
@@ -70,6 +80,37 @@
   <lname>20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<!-- ************************************************ -->
+<!--               MMF coupled compsets               -->
+<!-- ************************************************ -->
+<compset>
+  <alias>WCYCL1950-MMF1</alias>
+  <lname>1950SOI_EAM%CMIP6-MMF1_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>WCYCL20TR-MMF1</alias>
+  <lname>20TRSOI_EAM%CMIP6-MMF1_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<!-- separate compset for testing (NS = no spinup) -->
+<compset>
+  <alias>WCYCL20TRNS-MMF1</alias>
+  <lname>20TR_EAM%CMIP6-MMF1_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+<!-- ************************************************** -->
+<!-- ************************************************** -->
+
+<compset>
+  <alias>WCYCL20TR_chemUCI-Linozv3</alias>
+  <lname>20TRSOI_EAM%CHEMUCI-LINOZV3_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>WCYCL20TR_chemUCI-Linozv3-mam5</alias>
+  <lname>20TRSOI_EAM%CHEMUCI-LINOZV3-MAM5_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>WCYCLSSP585</alias>
   <lname>SSP585SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
@@ -289,17 +330,42 @@
 
 <compset>
   <alias>CRYO1850</alias>
-  <lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
+  <lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <compset>
   <alias>CRYO1850-4xCO2</alias>
-  <lname>1850SOI_EAM%CMIP6-4xCO2_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
+  <lname>1850SOI_EAM%CMIP6-4xCO2_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <compset>
   <alias>CRYO1950</alias>
-  <lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
+  <lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>CRYO1850-DISMF</alias>
+  <lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>CRYO1950-DISMF</alias>
+  <lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>CRYO20TR</alias>
+  <lname>20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>CRYOSSP585</alias>
+  <lname>SSP585SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>CRYOSSP370</alias>
+  <lname>SSP370SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <compset>