Adding compset/support for FISMF

Author: darincomeau

cime_config/allactive/config_compsets.xml

@@ -314,11 +314,11 @@
 
 <compset>
   <alias>CRYOSSP370</alias>
-  <lname>SSP370SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
+  <lname>SSP370SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <compset>
-  <alias>CRYOSSP370-DISMF</alias>
+  <alias>CRYOSSP370-FISMF</alias>
   <lname>SSP370SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
  </compset>
 

components/mpas-ocean/cime_config/buildnml

@@ -268,7 +268,7 @@ def buildnml(case, caseroot, compname):
             ic_date = '210203'
             ic_prefix = 'mpaso.SOwISC12to60E2r4.rstFromG-anvil'
         if ocn_ismf == 'data':
-            data_ismf_file = 'prescribed_ismf_adusumilli2020.SOwISC12to60E2r4.230516.nc'
+            data_ismf_file = 'prescribed_ismf_v2_1.SORRM.historical_0751-yrs2010-2014.nc'
 
     elif ocn_grid == 'ECwISC30to60E2r1':
         decomp_date = '200915'

components/mpas-ocean/src/analysis_members/mpas_ocn_conservation_check.F

@@ -2431,11 +2431,11 @@ subroutine ocn_restart_conservation_check(domain, err)!{{{
 
       err = 0
 
-      if ( trim(config_land_ice_flux_mode) == 'standalone' .or. &
-           trim(config_land_ice_flux_mode) == 'data' ) .or. &
-           trim(config_land_ice_flux_mode) == 'coupled' ) then
+!      if ( trim(config_land_ice_flux_mode) == 'standalone' .or. &
+!           trim(config_land_ice_flux_mode) == 'data' ) .or. &
+!           trim(config_land_ice_flux_mode) == 'coupled' ) then
          landIceFreshwaterFluxesOn = .true.
-      end if
+!      end if
 
    end subroutine ocn_restart_conservation_check!}}}