Merge pull request #2 from eclare108213/update_E3SM_2

Update to E3SM master

.gitmodules

@@ -55,6 +55,9 @@
 [submodule "externals/mct"]
 	path = externals/mct
 	url = [email protected]:MCSclimate/MCT.git
+[submodule "components/mpas-albany-landice/src/SeaLevelModel"]
+	path = components/mpas-albany-landice/src/SeaLevelModel
+	url = [email protected]:MALI-Dev/1DSeaLevelModel_FWTW.git
 [submodule "components/mpas-ocean/src/SHTNS"]
 	path = components/mpas-ocean/src/SHTNS
 	url = https://bitbucket.org/nschaeff/shtns.git

cime_config/allactive/config_pesall.xml

@@ -1225,16 +1225,16 @@
         <comment>anvil: --compset BGC* --res ne30pg2_r05_EC30to60E2r2 on 30 nodes pure-MPI, ~3 sypd </comment>
         <ntasks>
           <ntasks_atm>675</ntasks_atm>
-          <ntasks_lnd>144</ntasks_lnd>
-          <ntasks_rof>144</ntasks_rof>
-          <ntasks_ice>540</ntasks_ice>
+          <ntasks_lnd>684</ntasks_lnd>
+          <ntasks_rof>684</ntasks_rof>
+          <ntasks_ice>684</ntasks_ice>
           <ntasks_ocn>396</ntasks_ocn>
           <ntasks_cpl>684</ntasks_cpl>
         </ntasks>
         <rootpe>
           <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>540</rootpe_lnd>
-          <rootpe_rof>540</rootpe_rof>
+          <rootpe_lnd>0</rootpe_lnd>
+          <rootpe_rof>0</rootpe_rof>
           <rootpe_ice>0</rootpe_ice>
           <rootpe_ocn>684</rootpe_ocn>
           <rootpe_cpl>0</rootpe_cpl>

cime_config/machines/config_machines.xml

@@ -453,7 +453,7 @@
 
       <modules compiler="gnu">
         <command name="load">PrgEnv-gnu/8.3.3</command>
-        <command name="load">gcc/11.2.0</command>
+        <command name="load">gcc/12.1.0</command>
       </modules>
 
       <modules compiler="nvidia">
@@ -470,10 +470,10 @@
         <command name="load">craype-accel-host</command>
         <command name="load">cray-libsci</command>
         <command name="load">craype</command>
-        <command name="load">cray-mpich/8.1.17</command>
-        <command name="load">cray-hdf5-parallel/1.12.1.5</command>
-        <command name="load">cray-netcdf-hdf5parallel/4.8.1.5</command>
-        <command name="load">cray-parallel-netcdf/1.12.2.5</command>
+        <command name="load">cray-mpich/8.1.22</command>
+        <command name="load">cray-hdf5-parallel/1.12.2.1</command>
+        <command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
+        <command name="load">cray-parallel-netcdf/1.12.3.1</command>
         <command name="load">cmake/3.22.0</command>
       </modules>
     </module_system>
@@ -491,6 +491,7 @@
       <env name="HDF5_USE_FILE_LOCKING">FALSE</env>
       <env name="PERL5LIB">/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch</env>
       <env name="FI_CXI_RX_MATCH_MODE">software</env>
+      <env name="MPICH_COLL_SYNC">MPI_Bcast</env>
     </environment_variables>
     <resource_limits>
       <resource name="RLIMIT_STACK">-1</resource>
@@ -584,8 +585,8 @@
     <OS>CNL</OS>
     <COMPILERS>gnu,crayclang,amdclang</COMPILERS>
     <MPILIBS>mpich</MPILIBS>
-    <PROJECT>cli133</PROJECT>
-    <CIME_OUTPUT_ROOT>/gpfs/alpine/$PROJECT/proj-shared/$ENV{USER}/e3sm_scratch/crusher</CIME_OUTPUT_ROOT>
+    <PROJECT>cli133_crusher</PROJECT>
+    <CIME_OUTPUT_ROOT>/gpfs/alpine/cli133/proj-shared/$ENV{USER}/e3sm_scratch/crusher</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>/gpfs/alpine/cli115/world-shared/e3sm/inputdata</DIN_LOC_ROOT>
     <DIN_LOC_ROOT_CLMFORC>/gpfs/alpine/cli115/world-shared/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
@@ -4284,6 +4285,8 @@
     </module_system>
     <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
     <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
+    <TEST_TPUT_TOLERANCE>0.2</TEST_TPUT_TOLERANCE>
+    <TEST_MEMLEAK_TOLERANCE>0.20</TEST_MEMLEAK_TOLERANCE>
     <environment_variables compiler="gnu">
       <env name="HDF5_PATH">$SHELL{dirname $(dirname $(which h5diff))}</env>
       <env name="NETCDF_C_PATH">$SHELL{dirname $(dirname $(which nc-config))}</env>

cime_config/tests.py

@@ -17,6 +17,7 @@
             "ERS.r05_r05.RMOSGPCC.mosart-gpcc_1972",
             "ERS.MOS_USRDAT.RMOSGPCC.mosart-mos_usrdat",
             "SMS.MOS_USRDAT.RMOSGPCC.mosart-unstructure",
+            "ERS.r05_r05.RMOSGPCC.mosart-heat",
             )
         },
 

components/data_comps/drof/cime_config/config_component.xml

@@ -13,7 +13,7 @@
   -->
 
   <description modifier_mode="1">
-    <desc rof="DROF[%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p5][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF[%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
+    <desc rof="DROF[%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p5][%JRA-1p5-AIS0ROF][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF[%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
     <desc option="NULL"     >NULL mode</desc>
     <desc option="NYF"      >COREv2 normal year forcing:</desc>
     <desc option="IAF"      >COREv2 interannual year forcing:</desc>
@@ -22,6 +22,7 @@
     <desc option="IAFAIS55" >COREv2 interannual year forcing:</desc>
     <desc option="CPLHIST"  >CPLHIST mode:</desc>
     <desc option="JRA-1p5">JRA55 interannual forcing, v1.5, through 2020</desc>
+    <desc option="JRA-1p5-AIS0ROF">JRA55 interannual forcing, v1.5, through 2020, no rofi or rofl around AIS</desc>
     <desc option="JRA-1p4-2018">JRA55 interannual forcing, v1.4, through 2018</desc>
     <desc option="JRA-1p4-2018-AIS0ICE">JRA55 interannual forcing, v1.4, through 2018, no rofi around AIS</desc>
     <desc option="JRA-1p4-2018-AIS0LIQ">JRA55 interannual forcing, v1.4, through 2018, no rofl around AIS</desc>
@@ -43,7 +44,7 @@
 
   <entry id="DROF_MODE">
     <type>char</type>
-    <valid_values>CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p5,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL</valid_values>
+    <valid_values>CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p5,IAF_JRA_1p5_AIS0ROF,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL</valid_values>
     <default_value>DIATREN_ANN_RX1</default_value>
     <values match="last">
       <value compset="_DROF%NULL">NULL</value>
@@ -58,6 +59,7 @@
       <value compset="_DROF%CPLHIST">CPLHIST</value>
       <value compset="_DROF%JRA" >IAF_JRA</value>
       <value compset="_DROF%JRA-1p5" >IAF_JRA_1p5</value>
+      <value compset="_DROF%JRA-1p5-AIS0ROF" >IAF_JRA_1p5_AIS0ROF</value>
       <value compset="_DROF%JRA-1p4-2018" >IAF_JRA_1p4_2018</value>
       <value compset="_DROF%JRA-1p4-2018-AIS0ICE" >IAF_JRA_1p4_2018_AIS0ICE</value>
       <value compset="_DROF%JRA-1p4-2018-AIS0LIQ" >IAF_JRA_1p4_2018_AIS0LIQ</value>

components/data_comps/drof/cime_config/namelist_definition_drof.xml

@@ -63,6 +63,7 @@
       <value drof_mode="IAF_JRA_1p4_2018_AIS0LIQ">rof.iaf_jra_1p4_2018_ais0liq</value>
       <value drof_mode="IAF_JRA_1p4_2018_AIS0ROF">rof.iaf_jra_1p4_2018_ais0rof</value>
       <value drof_mode="IAF_JRA_1p4_2018"     >rof.iaf_jra_1p4_2018</value>
+      <value drof_mode="IAF_JRA_1p5_AIS0ROF"  >rof.iaf_jra_1p5_ais0rof</value>
       <value drof_mode="IAF_JRA_1p5"          >rof.iaf_jra_1p5</value>
       <value drof_mode="IAF_JRA"              >rof.iaf_jra</value>
       <value drof_mode="RYF8485_JRA"          >rof.ryf8485_jra</value>
@@ -203,6 +204,71 @@
       <value stream="rof.ryf8485_jra">RAF_8485.JRA.v1.3.runoff.180404.nc</value>
       <value stream="rof.ryf9091_jra">RAF_9091.JRA.v1.3.runoff.180404.nc</value>
       <value stream="rof.ryf0304_jra">RAF_0304.JRA.v1.3.runoff.180404.nc</value>
+      <value stream="rof.iaf_jra_1p5_ais0rof">
+           JRA.v1.5.runoff.1958.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1959.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1960.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1961.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1962.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1963.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1964.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1965.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1966.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1967.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1968.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1969.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1970.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1971.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1972.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1973.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1974.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1975.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1976.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1977.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1978.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1979.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1980.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1981.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1982.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1983.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1984.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1985.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1986.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1987.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1988.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1989.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1990.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1991.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1992.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1993.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1994.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1995.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1996.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1997.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1998.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.1999.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2000.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2001.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2002.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2003.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2004.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2005.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2006.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2007.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2008.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2009.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2010.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2011.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2012.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2013.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2014.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2015.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2016.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2017.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2018.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2019.no_rofi_no_rofl.210505.nc
+           JRA.v1.5.runoff.2020.no_rofi_no_rofl.210504.nc
+      </value>
       <value stream="rof.iaf_jra_1p5">
            JRA.v1.5.runoff.1958.210505.nc
            JRA.v1.5.runoff.1959.210505.nc

components/elm/cime_config/config_compsets.xml

@@ -508,7 +508,7 @@
   </compset>
 
   <compset>
-    <alias>I20TRCRUELMBGC</alias>
+    <alias>I20TRGSWELMBGC</alias>
     <lname>20TR_DATM%GSWP3v1_ELM%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 

components/elm/src/main/elm_driver.F90

@@ -1108,21 +1108,20 @@ subroutine elm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate)
                     filter(nc)%num_soilp, filter(nc)%soilp, &
                     cnstate_vars)
              end if
+
+             if (use_fates_sp) then
+               call SatellitePhenology(bounds_clump,               &
+               filter_inactive_and_active(nc)%num_soilp, filter_inactive_and_active(nc)%soilp,    &
+               waterstate_vars, canopystate_vars)
+             endif
+
           else ! not ( if-use_cn   or if-use_fates)
-
-             if (.not.use_fates_sp .and. doalb) then
+             if (doalb) then
                 ! Prescribed biogeography - prescribed canopy structure, some prognostic carbon fluxes
                 call SatellitePhenology(bounds_clump,               &
                      filter(nc)%num_nolakep, filter(nc)%nolakep,    &
                      waterstate_vars, canopystate_vars)
              end if
-
-             if (use_fates_sp .and. doalb) then
-               call SatellitePhenology(bounds_clump,               &
-               filter_inactive_and_active(nc)%num_soilp, filter_inactive_and_active(nc)%soilp,    &
-               waterstate_vars, canopystate_vars)
-             endif
-
           end if  ! end of if-use_cn   or if-use_fates
        end if ! end of is_active_betr_bgc
 

components/mosart/cime_config/testdefs/testmods_dirs/mosart/heat/shell_commands

@@ -0,0 +1 @@
+./xmlchange DATM_CLMNCEP_YR_END=1972

components/mosart/cime_config/testdefs/testmods_dirs/mosart/heat/user_nl_mosart

@@ -0,0 +1,2 @@
+frivinp_rtm = '$DIN_LOC_ROOT/rof/mosart/MOSART_global_half_20180721a.nc'
+heatflag = .true.

components/mosart/src/riverroute/MOSART_heat_mod.F90

@@ -75,21 +75,19 @@ subroutine subnetworkHeat_simple(iunit, theDeltaT)
         integer, intent(in) :: iunit
         real(r8), intent(in) :: theDeltaT    
 
-        real(r8) :: Qsur, Qsub ! flow rate of surface and subsurface runoff separately
-        !if(TUnit%fdir(iunit) >= 0 .and. TUnit%areaTotal(iunit) > TINYVALUE1) then
-                THeat%Hs_t(iunit) = 0._r8
-                THeat%Hl_t(iunit) = 0._r8
-                THeat%He_t(iunit) = 0._r8
-                THeat%Hh_t(iunit) = 0._r8
-                THeat%Hc_t(iunit) = 0._r8
+        THeat%Hs_t(iunit) = 0._r8
+        THeat%Hl_t(iunit) = 0._r8
+        THeat%He_t(iunit) = 0._r8
+        THeat%Hh_t(iunit) = 0._r8
+        THeat%Hc_t(iunit) = 0._r8
+
+        THeat%Ha_h2t(iunit) = 0._r8
+        THeat%Ha_t2r(iunit) = -cr_advectheat(abs(TRunoff%etout(iunit,nt_nliq)+TRunoff%etout(iunit,nt_nice)), THeat%Tt(iunit))
+        ! change of energy due to heat exchange with the environment
+        THeat%deltaH_t(iunit) = 0._r8 
+        ! change of energy due to advective heat flux
+        THeat%deltaM_t(iunit) = 0._r8 
 
-                THeat%Ha_h2t(iunit) = 0._r8
-                THeat%Ha_t2r(iunit) = -cr_advectheat(abs(TRunoff%etout(iunit,nt_nliq)+TRunoff%etout(iunit,nt_nice)), THeat%Tt(iunit))
-            ! change of energy due to heat exchange with the environment
-            THeat%deltaH_t(iunit) = theDeltaT * (THeat%Hs_t(iunit) + THeat%Hl_t(iunit) + THeat%He_t(iunit) + THeat%Hc_t(iunit) + THeat%Hh_t(iunit))
-            ! change of energy due to advective heat flux
-            THeat%deltaM_t(iunit) = theDeltaT * (THeat%Ha_h2t(iunit)-cr_advectheat(Qsur + Qsub, THeat%Tt(iunit)))
-        !end if
     end subroutine subnetworkHeat_simple
 
 

components/mpas-albany-landice/bld/build-namelist

@@ -457,12 +457,16 @@ if ($MALI_DYNAMIC eq 'TRUE') {
     add_default($nl, 'config_tracer_advection', 'val'=>"none");
 }
 add_default($nl, 'config_restore_thickness_after_advection');
+add_default($nl, 'config_zero_sfcMassBalApplied_over_bare_land');
 
 ##############################
 # Namelist group: solidearth #
 ##############################
 
 add_default($nl, 'config_uplift_method');
+add_default($nl, 'config_slm_coupling_interval');
+add_default($nl, 'config_MALI_to_SLM_weights_file');
+add_default($nl, 'config_SLM_to_MALI_weights_file');
 
 ###########################
 # Namelist group: calving #
@@ -488,6 +492,8 @@ add_default($nl, 'config_remove_small_islands');
 add_default($nl, 'config_calving_speed_limit');
 add_default($nl, 'config_grounded_von_Mises_threshold_stress');
 add_default($nl, 'config_floating_von_Mises_threshold_stress');
+add_default($nl, 'config_grounded_von_Mises_threshold_stress_source');
+add_default($nl, 'config_floating_von_Mises_threshold_stress_source');
 add_default($nl, 'config_finalize_damage_after_advection');
 add_default($nl, 'config_preserve_damage');
 add_default($nl, 'config_calculate_damage');
@@ -498,6 +504,9 @@ add_default($nl, 'config_damage_rheology_coupling');
 add_default($nl, 'config_damage_gl_setting');
 add_default($nl, 'config_damage_calving_method');
 add_default($nl, 'config_damagecalvingParameter');
+add_default($nl, 'config_ismip6_retreat_k');
+add_default($nl, 'config_calving_error_threshold');
+add_default($nl, 'config_distribute_unablatedVolumeDynCell');
 
 ##################################
 # Namelist group: thermal_solver #
@@ -566,7 +575,9 @@ add_default($nl, 'config_adaptive_timestep');
 add_default($nl, 'config_min_adaptive_timestep');
 add_default($nl, 'config_max_adaptive_timestep');
 add_default($nl, 'config_adaptive_timestep_CFL_fraction');
+add_default($nl, 'config_adaptive_timestep_calvingCFL_fraction');
 add_default($nl, 'config_adaptive_timestep_include_DCFL');
+add_default($nl, 'config_adaptive_timestep_include_calving');
 add_default($nl, 'config_adaptive_timestep_force_interval');
 
 ###################################

components/mpas-albany-landice/bld/build-namelist-section

@@ -23,12 +23,16 @@ add_default($nl, 'config_effective_pressure_max');
 add_default($nl, 'config_thickness_advection');
 add_default($nl, 'config_tracer_advection');
 add_default($nl, 'config_restore_thickness_after_advection');
+add_default($nl, 'config_zero_sfcMassBalApplied_over_bare_land');
 
 ##############################
 # Namelist group: solidearth #
 ##############################
 
 add_default($nl, 'config_uplift_method');
+add_default($nl, 'config_slm_coupling_interval');
+add_default($nl, 'config_MALI_to_SLM_weights_file');
+add_default($nl, 'config_SLM_to_MALI_weights_file');
 
 ###########################
 # Namelist group: calving #
@@ -50,6 +54,8 @@ add_default($nl, 'config_remove_small_islands');
 add_default($nl, 'config_calving_speed_limit');
 add_default($nl, 'config_grounded_von_Mises_threshold_stress');
 add_default($nl, 'config_floating_von_Mises_threshold_stress');
+add_default($nl, 'config_grounded_von_Mises_threshold_stress_source');
+add_default($nl, 'config_floating_von_Mises_threshold_stress_source');
 add_default($nl, 'config_finalize_damage_after_advection');
 add_default($nl, 'config_preserve_damage');
 add_default($nl, 'config_calculate_damage');
@@ -60,6 +66,9 @@ add_default($nl, 'config_damage_rheology_coupling');
 add_default($nl, 'config_damage_gl_setting');
 add_default($nl, 'config_damage_calving_method');
 add_default($nl, 'config_damagecalvingParameter');
+add_default($nl, 'config_ismip6_retreat_k');
+add_default($nl, 'config_calving_error_threshold');
+add_default($nl, 'config_distribute_unablatedVolumeDynCell');
 
 ##################################
 # Namelist group: thermal_solver #
@@ -128,7 +137,9 @@ add_default($nl, 'config_adaptive_timestep');
 add_default($nl, 'config_min_adaptive_timestep');
 add_default($nl, 'config_max_adaptive_timestep');
 add_default($nl, 'config_adaptive_timestep_CFL_fraction');
+add_default($nl, 'config_adaptive_timestep_calvingCFL_fraction');
 add_default($nl, 'config_adaptive_timestep_include_DCFL');
+add_default($nl, 'config_adaptive_timestep_include_calving');
 add_default($nl, 'config_adaptive_timestep_force_interval');
 
 ###################################