From 5159c842e619d48c0c1d1bb9c6f542e4e6f1a963 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 31 Jan 2024 14:25:46 -0700
Subject: [PATCH 01/27] replace with new name for landIceTopDragCoeff

---
 components/mpas-ocean/src/Registry.xml        | 19 ++++++++++++++++++-
 .../src/shared/mpas_ocn_diagnostics.F         |  7 +++++--
 .../shared/mpas_ocn_diagnostics_variables.F   | 13 ++++++++++---
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
index bb399577eee3..b81d8c26d3c2 100644
--- a/components/mpas-ocean/src/Registry.xml
+++ b/components/mpas-ocean/src/Registry.xml
@@ -1012,7 +1012,7 @@
 					possible_values="Any positive real number"
 		/>
 		<nml_option name="config_land_ice_flux_rms_tidal_velocity" type="real" default_value="5e-2" units="m s^-1"
-					description="Parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity"
+					description="Parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity (overwritten by Jourdain parameterization)"
 					possible_values="Any non-negative real number"
 		/>
 		<nml_option name="config_land_ice_flux_jenkins_heat_transfer_coefficient" type="real" default_value="0.011"
@@ -1023,6 +1023,18 @@
 					description="constant nondimensional salt transfer coefficient across the ice-ocean boundary layer"
 					possible_values="Any positive real number"
 		/>
+		<nml_option name="config_land_ice_flux_tidal_Jourdain_alpha" type="real" default_value="1"
+					description="alpha from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, alpha = 0.777"
+					possible_values="Any non-negative real number"
+		/>
+		<nml_option name="config_land_ice_flux_tidal_Jourdain_A0" type="real" default_value="1"
+					description="A0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, A0 = 0.656"
+					possible_values="Any non-negative real number"
+		/>
+		<nml_option name="config_land_ice_flux_tidal_Jourdain_U0" type="real" default_value="5e-2" units="m s^-1"
+					description="U0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, U0 = 0.003 m/s"
+					possible_values="Any non-negative real number"
+		/>
 	</nml_record>
 
 	<nml_record name="advection" mode="forward">
@@ -2200,6 +2212,7 @@
 			<var_array name="landIceInterfaceTracers"/>
 			<var_array name="landIceBoundaryLayerTracers"/>
 			<var name="landIceFrictionVelocity"/>
+			<var name="landIceTidalFrictionVelocity"/>
 			<var name="topDragMagnitude"/>
 			<var name="landIceFreshwaterFlux"/>
 			<var name="landIceHeatFlux"/>
@@ -3242,6 +3255,10 @@
 			description="The friction velocity $u_*$ under land ice"
 			packages="landIceFluxesPKG"
 		/>
+		<var name="landIceTidalFrictionVelocity" type="real" dimensions="nCells Time" units="m s^-1"
+			description="The tidal velocity that contributes to friction velocity $u_*$ under land ice"
+			packages="landIceFluxesPKG"
+		/>
 		<var name="topDrag" type="real" dimensions="nEdges Time" units="N m^-2"
 			description="Top drag at the surface of the ocean defined at edge midpoints. Magnitude in direction of edge normal."
 			packages="landIceFluxesPKG;dataLandIceFluxesPKG"
diff --git a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
index 288c79db284d..3db41f6b71c1 100644
--- a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
+++ b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
@@ -3612,9 +3612,12 @@ subroutine ocn_compute_land_ice_flux_input_fields(layerThickness, normalVelocity
       do iCell = 1, nCellsAll
          ! the friction velocity is the square root of the top drag + variance of tidal velocity
          ! (computed regardless of land-ice coverage)
+
          landIceFrictionVelocity(iCell) = sqrt(landIceTopDragCoeff * &
-                                   (2.0_RKIND * kineticEnergyCell(minLevelCell(iCell),iCell) &
-                                   + config_land_ice_flux_rms_tidal_velocity**2))
+                                   ((2.0_RKIND * kineticEnergyCell(minLevelCell(iCell),iCell))**2 &
+                                   + config_land_ice_flux_tidal_Jourdain_alpha**2 * &
+                                   (config_land_ice_flux_tidal_Jourdain_A0 * landIceTidalFrictionVelocity(iCell) + &
+                                   config_land_ice_flux_tidal_Jourdain_U0)**2))
       end do
 #ifndef MPAS_OPENACC
       !$omp end do
diff --git a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
index 567c3efc183c..86fb24b80320 100644
--- a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
+++ b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
@@ -83,6 +83,8 @@ module ocn_diagnostics_variables
    real (kind=RKIND), dimension(:), pointer :: surfaceFluxAttenuationCoefficientRunoff
 
    real (kind=RKIND), dimension(:), pointer :: landIceFrictionVelocity
+   real (kind=RKIND), dimension(:), pointer :: landIceTidalFrictionVelocity
+
    real (kind=RKIND), dimension(:), pointer :: topDrag
    real (kind=RKIND), dimension(:), pointer :: topDragMag
    real (kind=RKIND), dimension(:), pointer :: topographic_wave_drag
@@ -349,6 +351,8 @@ subroutine ocn_diagnostics_variables_init(domain, jenkinsOn, hollandJenkinsOn, e
                     landIceTracerTransferVelocities)
          call mpas_pool_get_array(diagnosticsPool, &
                    'landIceFrictionVelocity', landIceFrictionVelocity)
+         call mpas_pool_get_array(diagnosticsPool, &
+                   'landIceTidalFrictionVelocity', landIceTidalFrictionVelocity)
       end if
 
       if ( trim(config_ocean_run_mode) == 'init' ) then
@@ -685,7 +689,8 @@ subroutine ocn_diagnostics_variables_init(domain, jenkinsOn, hollandJenkinsOn, e
          !$acc                   topDragMag,                      &
          !$acc                   landIceBoundaryLayerTracers,     &
          !$acc                   landIceTracerTransferVelocities, &
-         !$acc                   landIceFrictionVelocity)
+         !$acc                   landIceFrictionVelocity,         &
+         !$acc                   landIceTidalFrictionVelocity)
       end if
       if (config_use_topographic_wave_drag) then
          !$acc enter data create(topographic_wave_drag)
@@ -932,7 +937,8 @@ subroutine ocn_diagnostics_variables_destroy(err) !{{{
          !$acc                   topDragMag,                      &
          !$acc                   landIceBoundaryLayerTracers,     &
          !$acc                   landIceTracerTransferVelocities, &
-         !$acc                   landIceFrictionVelocity)
+         !$acc                   landIceFrictionVelocity,         &
+         !$acc                   landIceTidalFrictionVelocity)
       end if
       if (config_use_topographic_wave_drag) then
          !$acc exit data delete(topographic_wave_drag)
@@ -1147,7 +1153,8 @@ subroutine ocn_diagnostics_variables_destroy(err) !{{{
                  topDragMag,                      &
                  landIceBoundaryLayerTracers,     &
                  landIceTracerTransferVelocities, &
-                 landIceFrictionVelocity)
+                 landIceFrictionVelocity,         &
+                 landIceTidalFrictionVelocity)
       end if
       if ( trim(config_ocean_run_mode) == 'init' ) then
          nullify(rx1Edge,                  &

From 48aa7546cf3b6ad3ef93074654fceb028b2de0a1 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 31 Jan 2024 14:31:11 -0700
Subject: [PATCH 02/27] Resolved - keep ocn_ismf and tidal cahnges in buildnml

---
 components/mpas-ocean/bld/build-namelist      |  7 +++++++
 components/mpas-ocean/cime_config/buildnml    | 19 +++++++++++++++++++
 .../cime_config/config_component.xml          | 13 +++++++++++++
 components/mpas-ocean/src/Registry.xml        |  2 +-
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist
index 19418582863e..77a8e0fccc63 100755
--- a/components/mpas-ocean/bld/build-namelist
+++ b/components/mpas-ocean/bld/build-namelist
@@ -67,6 +67,8 @@ OPTIONS
      -ice_bgc              check for coupling with sea ice BGC
      -ntasks_ocn           NTASKS_OCN for this case
      -ninst_ocn            NINST_OCN for this case
+     -ocn_tidal_mixing     variable for defining if to run with parameterized tidal mixing
+                           Options are: false, true. Default is false
 
 NOTE: The precedence for setting the values of namelist variables is (highest to lowest):
       1. namelist values set by specific command-line options, i.e. (none right now)
@@ -119,6 +121,7 @@ my %opts = ( help          => 0,
              cfg_dir       => $cfgdir,
              ntasks_ocn    => 0,
              ninst_ocn     => 0,
+             ocn_tidal_mixing => undef,
            );
 
 GetOptions(
@@ -145,6 +148,7 @@ GetOptions(
     "ntasks_ocn=i"    => \$opts{'ntasks_ocn'},
     "ninst_ocn=i"     => \$opts{'ninst_ocn'},
     "preview"         => \$opts{'preview'},
+    "ocn_tidal_mixing=s"   => \$opts{'ocn_tidal_mixing'},
 )  or usage();
 
 # Give usage message.
@@ -185,6 +189,7 @@ my $atm_co2_const_val = $opts{'atm_co2_const_val'};
 my $ice_bgc       = $opts{'ice_bgc'};
 my $NINST_OCN     = $opts{'ninst_ocn'};
 my $NTASKS_OCN    = $opts{'ntasks_ocn'};
+my $OCN_TIDAL_MIXING   = $opts{'ocn_tidal_mixing'};
 $cfgdir           = $opts{'cfg_dir'};
 
 my $CIMEROOT;
@@ -205,6 +210,7 @@ print $fh  <<"EOF";
 <config_definition>
 <entry id="ocn_grid" value="$OCN_GRID">
 <entry id="ocn_forcing" value="$OCN_FORCING">
+<entry id="ocn_tidal_mixing" value="$OCN_TIDAL_MIXING">
 <entry id="decomp_prefix" value="$decomp_prefix">
 <entry id="date_stamp" value="$date_stamp">
 </config_definition>
@@ -450,6 +456,7 @@ my $ntasks = $NTASKS_OCN / $NINST_OCN;
 
 print "MPASO build-namelist: ocn_grid is $OCN_GRID \n";
 print "MPASO build-namelist: ocn_forcing is $OCN_FORCING \n";
+print "MPASO build-namelist: ocn_tidal_mixing is $OCN_TIDAL_MIXING \n";
 
 (-d $DIN_LOC_ROOT)  or mkdir $DIN_LOC_ROOT;
 if ($print>=2) { print "CIME inputdata root directory: $DIN_LOC_ROOT$eol"; }
diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 048e621fafad..54577e978f88 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -37,6 +37,7 @@ def buildnml(case, caseroot, compname):
     ocn_ismf          = case.get_value("MPASO_ISMF")
     ocn_bgc           = case.get_value("MPASO_BGC")
     ocn_wave          = case.get_value("MPASO_WAVE")
+    ocn_tidal_mixing  = case.get_value("MPASO_TIDAL_MIXING")
     ocn_co2_type      = case.get_value("OCN_CO2_TYPE")
     atm_co2_const_val = case.get_value("CCSM_CO2_PPMV")
     ice_bgc           = case.get_value("MPASI_BGC")
@@ -263,6 +264,7 @@ def buildnml(case, caseroot, compname):
         restoring_file = 'sss.PHC2_monthlyClimatology.SOwISC12to60E2r4_nomask.210120.nc'
         analysis_mask_file = 'SOwISC12to60E2r4_mocBasinsAndTransects20210623.nc'
         ic_date = '230220'
+        u_tidal_rms_file = 'SOwISC12to60E2r4_uTidalRMS_CATS2008.nc'
         ic_prefix = 'ocean.SOwISC12to60E2r4'
         if ocn_ic_mode == 'spunup':
             ic_date = '230220'
@@ -388,6 +390,9 @@ def buildnml(case, caseroot, compname):
         if data_ismf_file != '':
             input_list.write("data_ismf = {}/ocn/mpas-o/{}/{}\n".format(din_loc_root, ocn_mask, data_ismf_file))
 
+        if ocn_tidal_mixing == 'true':
+            input_list.write("u_tidal_rms = {}/ocn/mpas-o/{}/{}\n".format(din_loc_root, ocn_mask, u_tidal_rms_file))
+
     #--------------------------------------------------------------------
     # Invoke mpas build-namelist - output will go in $CASEBUILD/mpasoconf
     #--------------------------------------------------------------------
@@ -449,6 +454,7 @@ def buildnml(case, caseroot, compname):
         sysmod += " -ocn_ismf '{}'".format(ocn_ismf)
         sysmod += " -ocn_bgc '{}'".format(ocn_bgc)
         sysmod += " -ocn_wave '{}'".format(ocn_wave)
+        sysmod += " -ocn_tidal_mixing '{}'".format(ocn_tidal_mixing)
         sysmod += " -ocn_co2_type '{}'".format(ocn_co2_type)
         sysmod += " -atm_co2_const_val '{}'".format(atm_co2_const_val)
         sysmod += " -ice_bgc '{}'".format(ice_bgc)
@@ -635,6 +641,19 @@ def buildnml(case, caseroot, compname):
                 lines.append('</stream>')
                 lines.append('')
 
+            if ocn_tidal_mixing == 'true':
+                lines.append('<stream name="tidal_velocity_rms_parameterized"')
+                lines.append('       type="input"')
+                lines.append('       io_type="{}"'.format(ocn_pio_typename))
+                lines.append('       filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, u_tidal_rms_file))
+                lines.append('       input_interval="none"')
+                lines.append('       packages="landIceFluxesPKG">')
+                lines.append('')
+                lines.append('       <var name="xtime"/>')
+                lines.append('       <var name="landIceTidalFrictionVelocity"/>')
+                lines.append('</stream>')
+                lines.append('')
+
             if analysis_mask_file != '':
                 lines.append('<stream name="transectMasksInput"')
                 lines.append('        type="input"')
diff --git a/components/mpas-ocean/cime_config/config_component.xml b/components/mpas-ocean/cime_config/config_component.xml
index c07170ae42b9..e95b63682d95 100644
--- a/components/mpas-ocean/cime_config/config_component.xml
+++ b/components/mpas-ocean/cime_config/config_component.xml
@@ -26,6 +26,19 @@
         <desc>Option to describe the MPASO surface forcing</desc>
   </entry>
 
+  <entry id="MPASO_TIDAL_MIXING">
+        <type>char</type>
+        <valid_values>false,true</valid_values>
+        <default_value>false</default_value>
+        <values>
+           <value compset="MPASO_">false</value>
+           <value compset="_MPASO%.*TMIX">true</value>
+        </values>
+        <group>case_comp</group>
+        <file>env_case.xml</file>
+        <desc>Option to describe the MPASO prescribed tidal mixing</desc>
+  </entry>
+
   <entry id="MPASO_ICEBERG">
         <type>char</type>
         <valid_values>false,true</valid_values>
diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
index b81d8c26d3c2..1fc5747c4450 100644
--- a/components/mpas-ocean/src/Registry.xml
+++ b/components/mpas-ocean/src/Registry.xml
@@ -3255,7 +3255,7 @@
 			description="The friction velocity $u_*$ under land ice"
 			packages="landIceFluxesPKG"
 		/>
-		<var name="landIceTidalFrictionVelocity" type="real" dimensions="nCells Time" units="m s^-1"
+		<var name="landIceTidalFrictionVelocity" type="real" dimensions="nCells" units="m s^-1"
 			description="The tidal velocity that contributes to friction velocity $u_*$ under land ice"
 			packages="landIceFluxesPKG"
 		/>

From 350108e338673c4205a8c2fcc8fc60100626b743 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 31 Jan 2024 14:38:27 -0700
Subject: [PATCH 03/27] Resolved - keep both date change and tidal file name
 change

---
 components/mpas-ocean/cime_config/buildnml           |  4 ++--
 components/mpas-ocean/src/Registry.xml               |  6 +++---
 .../mpas-ocean/src/shared/mpas_ocn_diagnostics.F     |  2 +-
 .../src/shared/mpas_ocn_diagnostics_variables.F      | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 54577e978f88..2786050eb6c3 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -264,7 +264,7 @@ def buildnml(case, caseroot, compname):
         restoring_file = 'sss.PHC2_monthlyClimatology.SOwISC12to60E2r4_nomask.210120.nc'
         analysis_mask_file = 'SOwISC12to60E2r4_mocBasinsAndTransects20210623.nc'
         ic_date = '230220'
-        u_tidal_rms_file = 'SOwISC12to60E2r4_uTidalRMS_CATS2008.nc'
+        u_tidal_rms_file = 'SOwISC12to60E2r4_velocityTidalRMS_CATS2008.nc'
         ic_prefix = 'ocean.SOwISC12to60E2r4'
         if ocn_ic_mode == 'spunup':
             ic_date = '230220'
@@ -650,7 +650,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('       packages="landIceFluxesPKG">')
                 lines.append('')
                 lines.append('       <var name="xtime"/>')
-                lines.append('       <var name="landIceTidalFrictionVelocity"/>')
+                lines.append('       <var name="velocityTidalRMS"/>')
                 lines.append('</stream>')
                 lines.append('')
 
diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
index 1fc5747c4450..82349195b061 100644
--- a/components/mpas-ocean/src/Registry.xml
+++ b/components/mpas-ocean/src/Registry.xml
@@ -2212,7 +2212,7 @@
 			<var_array name="landIceInterfaceTracers"/>
 			<var_array name="landIceBoundaryLayerTracers"/>
 			<var name="landIceFrictionVelocity"/>
-			<var name="landIceTidalFrictionVelocity"/>
+			<var name="velocityTidalRMS"/>
 			<var name="topDragMagnitude"/>
 			<var name="landIceFreshwaterFlux"/>
 			<var name="landIceHeatFlux"/>
@@ -3255,8 +3255,8 @@
 			description="The friction velocity $u_*$ under land ice"
 			packages="landIceFluxesPKG"
 		/>
-		<var name="landIceTidalFrictionVelocity" type="real" dimensions="nCells" units="m s^-1"
-			description="The tidal velocity that contributes to friction velocity $u_*$ under land ice"
+		<var name="velocityTidalRMS" type="real" dimensions="nCells" units="m s^-1"
+			description="Root mean square tidal velocity from tidal model for drag and melt parametrizations"
 			packages="landIceFluxesPKG"
 		/>
 		<var name="topDrag" type="real" dimensions="nEdges Time" units="N m^-2"
diff --git a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
index 3db41f6b71c1..53dc7716abff 100644
--- a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
+++ b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
@@ -3616,7 +3616,7 @@ subroutine ocn_compute_land_ice_flux_input_fields(layerThickness, normalVelocity
          landIceFrictionVelocity(iCell) = sqrt(landIceTopDragCoeff * &
                                    ((2.0_RKIND * kineticEnergyCell(minLevelCell(iCell),iCell))**2 &
                                    + config_land_ice_flux_tidal_Jourdain_alpha**2 * &
-                                   (config_land_ice_flux_tidal_Jourdain_A0 * landIceTidalFrictionVelocity(iCell) + &
+                                   (config_land_ice_flux_tidal_Jourdain_A0 * velocityTidalRMS(iCell) + &
                                    config_land_ice_flux_tidal_Jourdain_U0)**2))
       end do
 #ifndef MPAS_OPENACC
diff --git a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
index 86fb24b80320..bff963a56bde 100644
--- a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
+++ b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
@@ -83,7 +83,7 @@ module ocn_diagnostics_variables
    real (kind=RKIND), dimension(:), pointer :: surfaceFluxAttenuationCoefficientRunoff
 
    real (kind=RKIND), dimension(:), pointer :: landIceFrictionVelocity
-   real (kind=RKIND), dimension(:), pointer :: landIceTidalFrictionVelocity
+   real (kind=RKIND), dimension(:), pointer :: velocityTidalRMS
 
    real (kind=RKIND), dimension(:), pointer :: topDrag
    real (kind=RKIND), dimension(:), pointer :: topDragMag
@@ -350,9 +350,9 @@ subroutine ocn_diagnostics_variables_init(domain, jenkinsOn, hollandJenkinsOn, e
                    'landIceTracerTransferVelocities', &
                     landIceTracerTransferVelocities)
          call mpas_pool_get_array(diagnosticsPool, &
-                   'landIceFrictionVelocity', landIceFrictionVelocity)
+                   'velocityTidalRMS', velocityTidalRMS)
          call mpas_pool_get_array(diagnosticsPool, &
-                   'landIceTidalFrictionVelocity', landIceTidalFrictionVelocity)
+                   'velocityTidalRMS', velocityTidalRMS)
       end if
 
       if ( trim(config_ocean_run_mode) == 'init' ) then
@@ -690,7 +690,7 @@ subroutine ocn_diagnostics_variables_init(domain, jenkinsOn, hollandJenkinsOn, e
          !$acc                   landIceBoundaryLayerTracers,     &
          !$acc                   landIceTracerTransferVelocities, &
          !$acc                   landIceFrictionVelocity,         &
-         !$acc                   landIceTidalFrictionVelocity)
+         !$acc                   velocityTidalRMS)
       end if
       if (config_use_topographic_wave_drag) then
          !$acc enter data create(topographic_wave_drag)
@@ -938,7 +938,7 @@ subroutine ocn_diagnostics_variables_destroy(err) !{{{
          !$acc                   landIceBoundaryLayerTracers,     &
          !$acc                   landIceTracerTransferVelocities, &
          !$acc                   landIceFrictionVelocity,         &
-         !$acc                   landIceTidalFrictionVelocity)
+         !$acc                   velocityTidalRMS)
       end if
       if (config_use_topographic_wave_drag) then
          !$acc exit data delete(topographic_wave_drag)
@@ -1154,7 +1154,7 @@ subroutine ocn_diagnostics_variables_destroy(err) !{{{
                  landIceBoundaryLayerTracers,     &
                  landIceTracerTransferVelocities, &
                  landIceFrictionVelocity,         &
-                 landIceTidalFrictionVelocity)
+                 velocityTidalRMS)
       end if
       if ( trim(config_ocean_run_mode) == 'init' ) then
          nullify(rx1Edge,                  &

From 71aab2f65d5fa251e561eeb47c96e7d9d3b0b1e1 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Thu, 23 Feb 2023 12:23:32 -0700
Subject: [PATCH 04/27] typo fix

---
 .../mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
index bff963a56bde..195243a124ce 100644
--- a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
+++ b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics_variables.F
@@ -350,7 +350,7 @@ subroutine ocn_diagnostics_variables_init(domain, jenkinsOn, hollandJenkinsOn, e
                    'landIceTracerTransferVelocities', &
                     landIceTracerTransferVelocities)
          call mpas_pool_get_array(diagnosticsPool, &
-                   'velocityTidalRMS', velocityTidalRMS)
+                   'landIceFrictionVelocity', landIceFrictionVelocity)
          call mpas_pool_get_array(diagnosticsPool, &
                    'velocityTidalRMS', velocityTidalRMS)
       end if

From 65c3a8211585eabb42cf3e05ae66b1d47c5bc75b Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 31 Jan 2024 14:43:15 -0700
Subject: [PATCH 05/27] Resolved: again replace with new name for
 landIceTopDragCoeff

---
 components/mpas-ocean/src/Registry.xml                  | 2 +-
 components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
index 82349195b061..e3e9d3150f4a 100644
--- a/components/mpas-ocean/src/Registry.xml
+++ b/components/mpas-ocean/src/Registry.xml
@@ -1027,7 +1027,7 @@
 					description="alpha from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, alpha = 0.777"
 					possible_values="Any non-negative real number"
 		/>
-		<nml_option name="config_land_ice_flux_tidal_Jourdain_A0" type="real" default_value="1"
+		<nml_option name="config_land_ice_flux_tidal_Jourdain_A0" type="real" default_value="0"
 					description="A0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, A0 = 0.656"
 					possible_values="Any non-negative real number"
 		/>
diff --git a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
index 53dc7716abff..946b9fd5cee5 100644
--- a/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
+++ b/components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F
@@ -3614,7 +3614,7 @@ subroutine ocn_compute_land_ice_flux_input_fields(layerThickness, normalVelocity
          ! (computed regardless of land-ice coverage)
 
          landIceFrictionVelocity(iCell) = sqrt(landIceTopDragCoeff * &
-                                   ((2.0_RKIND * kineticEnergyCell(minLevelCell(iCell),iCell))**2 &
+                                   (2.0_RKIND * kineticEnergyCell(minLevelCell(iCell),iCell) &
                                    + config_land_ice_flux_tidal_Jourdain_alpha**2 * &
                                    (config_land_ice_flux_tidal_Jourdain_A0 * velocityTidalRMS(iCell) + &
                                    config_land_ice_flux_tidal_Jourdain_U0)**2))

From 0aa76c31b69ef06da5a437c7fcea2fa98d40649d Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Tue, 26 Mar 2024 16:15:54 -0600
Subject: [PATCH 06/27] resolve

---
 components/mpas-ocean/bld/build-namelist                      | 4 ++++
 .../mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml | 3 +++
 components/mpas-ocean/cime_config/buildnml                    | 1 +
 3 files changed, 8 insertions(+)

diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist
index 77a8e0fccc63..4d79d825cd06 100755
--- a/components/mpas-ocean/bld/build-namelist
+++ b/components/mpas-ocean/bld/build-namelist
@@ -795,6 +795,10 @@ add_default($nl, 'config_land_ice_flux_ISOMIP_gammaT');
 add_default($nl, 'config_land_ice_flux_rms_tidal_velocity');
 add_default($nl, 'config_land_ice_flux_jenkins_heat_transfer_coefficient');
 add_default($nl, 'config_land_ice_flux_jenkins_salt_transfer_coefficient');
+add_default($nl, 'config_land_ice_flux_tidal_Jourdain_alpha');
+add_default($nl, 'config_land_ice_flux_tidal_Jourdain_A0');
+add_default($nl, 'config_land_ice_flux_tidal_Jourdain_U0');
+
 
 #############################
 # Namelist group: advection #
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
index 6541b9a5a2be..091a519caab0 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
@@ -426,6 +426,9 @@
 <config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="FRISwISC04to60E3r1">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
 <config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="FRISwISC02to60E3r1">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
 <config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="FRISwISC01to60E3r1">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
+<config_land_ice_flux_tidal_Jourdain_alpha>1.0</config_land_ice_flux_tidal_Jourdain_alpha>
+<config_land_ice_flux_tidal_Jourdain_A0>0.0</config_land_ice_flux_tidal_Jourdain_A0>
+<config_land_ice_flux_tidal_Jourdain_U0>5e-2</config_land_ice_flux_tidal_Jourdain_U0>
 
 <!-- advection -->
 <config_vert_advection_method>'flux-form'</config_vert_advection_method>
diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 2786050eb6c3..ba0ff5a4d917 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -1308,6 +1308,7 @@ def buildnml(case, caseroot, compname):
             lines.append('    <var name="landIceHeatFlux"/>')
             lines.append('    <var name="heatFluxToLandIce"/>')
             lines.append('    <var name="landIceFrictionVelocity"/>')
+            lines.append('    <var name="velocityTidalRMS"/>')
             lines.append('    <var_array name="landIceBoundaryLayerTracers"/>')
             lines.append('    <var_array name="landIceInterfaceTracers"/>')
             lines.append('    <var name="mocStreamvalLatAndDepth"/>')

From cb79214686898a226d59be399e96fdec5c3cb4fd Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 31 Jan 2024 14:49:24 -0700
Subject: [PATCH 07/27] Resolved: kept both

---
 components/mpas-ocean/cime_config/buildnml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index ba0ff5a4d917..7ede82ce2af5 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -131,6 +131,7 @@ def buildnml(case, caseroot, compname):
         decomp_date = '230422'
         decomp_prefix = 'partitions/mpas-o.graph.info.'
         ic_date = '230220'
+        u_tidal_rms_file = 'oQU240wLI_velocityTidalRMS_CATS2008.nc'
         ic_prefix = 'ocean.QU.240wLI'
         if ocn_ic_mode == 'spunup':
             logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case")

From 66f1bcc69c9b1673b8ee0522495b63161c47affd Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Tue, 7 Mar 2023 18:09:48 -0700
Subject: [PATCH 08/27] add jourdain constants to namelist_definition_mpaso.xml

---
 .../namelist_definition_mpaso.xml             | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
index 196d4abf730c..cf2dd6cadf3b 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
@@ -1614,6 +1614,30 @@ Valid values: Any positive real number
 Default: Defined in namelist_defaults.xml
 </entry>
 
+<entry id="config_land_ice_flux_tidal_Jourdain_alpha" type="real"
+	category="land_ice_fluxes" group="land_ice_fluxes">
+Constant in parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity
+
+Valid values: Any positive real number
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_land_ice_flux_tidal_Jourdain_A0" type="real"
+	category="land_ice_fluxes" group="land_ice_fluxes">
+Constant in parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity
+
+Valid values: Any positive real number
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_land_ice_flux_tidal_Jourdain_U0" type="real"
+	category="land_ice_fluxes" group="land_ice_fluxes">
+Constant in parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity
+
+Valid values: Any positive real number
+Default: Defined in namelist_defaults.xml
+</entry>
+
 
 <!-- advection -->
 

From 976037a2338ca8618de91a0fe110a8f1141691bd Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 8 Mar 2023 13:53:17 -0700
Subject: [PATCH 09/27] more forgotten namelist stuff

---
 components/mpas-ocean/bld/build-namelist-section | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/mpas-ocean/bld/build-namelist-section b/components/mpas-ocean/bld/build-namelist-section
index 0c834f05cec1..2f28568119b8 100644
--- a/components/mpas-ocean/bld/build-namelist-section
+++ b/components/mpas-ocean/bld/build-namelist-section
@@ -305,6 +305,9 @@ add_default($nl, 'config_land_ice_flux_ISOMIP_gammaT');
 add_default($nl, 'config_land_ice_flux_rms_tidal_velocity');
 add_default($nl, 'config_land_ice_flux_jenkins_heat_transfer_coefficient');
 add_default($nl, 'config_land_ice_flux_jenkins_salt_transfer_coefficient');
+add_default($nl, 'config_land_ice_flux_tidal_Jourdain_alpha');
+add_default($nl, 'config_land_ice_flux_tidal_Jourdain_A0');
+add_default($nl, 'config_land_ice_flux_tidal_Jourdain_U0');
 
 #############################
 # Namelist group: advection #

From 0c8044ffdf26af5a8a8fd9d1d8e7fe24bf33a102 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 31 Jan 2024 14:55:37 -0700
Subject: [PATCH 10/27] ismf to pismf

---
 components/mpas-ocean/cime_config/config_compsets.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml
index b15f9111be44..590db1ef6141 100644
--- a/components/mpas-ocean/cime_config/config_compsets.xml
+++ b/components/mpas-ocean/cime_config/config_compsets.xml
@@ -72,6 +72,11 @@
     <lname>2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-JRA1p5-DIB-PISMF-TMIX</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-JRA1p4</alias>
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
@@ -112,6 +117,11 @@
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-JRA1p4-DIB-PISMF-TMIX</alias>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-DIB-NYF</alias>
     <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%NYFAIS55_SGLC_SWAV</lname>

From 7627d8facc07e889adc17aecd7ca98b1bd1a7b8d Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 8 Mar 2023 16:42:35 -0700
Subject: [PATCH 11/27] more TMIX compsets - NYF and IAF

---
 components/mpas-ocean/cime_config/config_compsets.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml
index 590db1ef6141..46cae361ee3b 100644
--- a/components/mpas-ocean/cime_config/config_compsets.xml
+++ b/components/mpas-ocean/cime_config/config_compsets.xml
@@ -42,6 +42,11 @@
     <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%NYFAIS45_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-NYF-ISMF-TMIX</alias>
+    <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%ISMFDATMFORCEDTMIX_DROF%NYFAIS45_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-IAF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%DATMFORCED_DROF%IAF_SGLC_SWAV</lname>
@@ -122,6 +127,11 @@
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-IAF-ISMF-TMIX</alias>
+    <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%ISMFDATMFORCEDTMIX_DROF%IAFAIS45_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-DIB-NYF</alias>
     <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%NYFAIS55_SGLC_SWAV</lname>

From d9eef97da0910a267fc09f5656577f2d86afb3c6 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 31 Jan 2024 15:03:54 -0700
Subject: [PATCH 12/27] Resolved - keep both date change and tidal file name
 change

---
 components/mpas-ocean/cime_config/buildnml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 7ede82ce2af5..c2c70d048ae5 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -331,6 +331,7 @@ def buildnml(case, caseroot, compname):
         restoring_file = 'sss.PHC2_monthlyClimatology.ECwISC30to60E2r1_nomask.201221.nc'
         analysis_mask_file = 'ECwISC30to60E2r1_mocBasinsAndTransects20210623.nc'
         ic_date = '230220'
+        u_tidal_rms_file = 'ECwISC30to60E2r1_velocityTidalRMS_CATS2008.nc'
         ic_prefix = 'ocean.ECwISC30to60E2r1'
         if ocn_ic_mode == 'spunup':
             ic_date = '230220'

From e27358d1ee1f71fba1baffc6cf14d4203e793e97 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 22 Mar 2023 11:16:11 -0600
Subject: [PATCH 13/27] tell mpaso to read tidal file at init

---
 components/mpas-ocean/cime_config/buildnml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index c2c70d048ae5..0eab714ebb56 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -648,10 +648,9 @@ def buildnml(case, caseroot, compname):
                 lines.append('       type="input"')
                 lines.append('       io_type="{}"'.format(ocn_pio_typename))
                 lines.append('       filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, u_tidal_rms_file))
-                lines.append('       input_interval="none"')
+                lines.append('       input_interval="initial_only"')
                 lines.append('       packages="landIceFluxesPKG">')
                 lines.append('')
-                lines.append('       <var name="xtime"/>')
                 lines.append('       <var name="velocityTidalRMS"/>')
                 lines.append('</stream>')
                 lines.append('')

From ae11914612bbbc01998beb70c7315d0148a8b79f Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 22 Mar 2023 12:09:46 -0600
Subject: [PATCH 14/27] >

---
 components/mpas-ocean/cime_config/buildnml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 0eab714ebb56..860909400527 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -648,7 +648,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('       type="input"')
                 lines.append('       io_type="{}"'.format(ocn_pio_typename))
                 lines.append('       filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, u_tidal_rms_file))
-                lines.append('       input_interval="initial_only"')
+                lines.append('       input_interval="initial_only">')
                 lines.append('       packages="landIceFluxesPKG">')
                 lines.append('')
                 lines.append('       <var name="velocityTidalRMS"/>')

From 6235dae8588268892bdd600c7da6c2b1c54d4f0d Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Mon, 3 Apr 2023 14:31:30 -0600
Subject: [PATCH 15/27] remove > on jb backup

---
 components/mpas-ocean/cime_config/buildnml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 860909400527..baf621f152ec 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -648,7 +648,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('       type="input"')
                 lines.append('       io_type="{}"'.format(ocn_pio_typename))
                 lines.append('       filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, u_tidal_rms_file))
-                lines.append('       input_interval="initial_only">')
+                lines.append('       input_interval="initial_only" ')
                 lines.append('       packages="landIceFluxesPKG">')
                 lines.append('')
                 lines.append('       <var name="velocityTidalRMS"/>')

From 6a74f0ee04fa25bfb3acb3460f9eda735d2a2f75 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Fri, 21 Apr 2023 10:18:12 -0600
Subject: [PATCH 16/27] added compsets for C cases

---
 .../mpas-ocean/cime_config/config_compsets.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml
index 46cae361ee3b..a4bb0d5aad5a 100644
--- a/components/mpas-ocean/cime_config/config_compsets.xml
+++ b/components/mpas-ocean/cime_config/config_compsets.xml
@@ -27,6 +27,24 @@
     <support_level>Experimental, under development</support_level>
   </compset>
 
+  <compset>
+    <alias>CMPASO-JRA1p5</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%DATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+    <support_level>Experimental, under development</support_level>
+  </compset>
+
+  <compset>
+    <alias>CMPASO-JRA1p5-ISMF</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+    <support_level>Experimental, under development</support_level>
+  </compset>
+
+  <compset>
+    <alias>CMPASO-JRA1p5-ISMF-TMIX</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCEDTMIX_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+    <support_level>Experimental, under development</support_level>
+  </compset>
+
   <compset>
     <alias>GMPAS-NYF</alias>
     <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%DATMFORCED_DROF%NYF_SGLC_SWAV</lname>

From 3ecba5617e6e69db1a26b122957b6dd9e1f5f1db Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Fri, 21 Apr 2023 11:38:49 -0600
Subject: [PATCH 17/27] corrected compsets for C cases

---
 components/mpas-ocean/cime_config/config_compsets.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml
index a4bb0d5aad5a..d6d835120866 100644
--- a/components/mpas-ocean/cime_config/config_compsets.xml
+++ b/components/mpas-ocean/cime_config/config_compsets.xml
@@ -29,19 +29,19 @@
 
   <compset>
     <alias>CMPASO-JRA1p5</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%DATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%DATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
     <support_level>Experimental, under development</support_level>
   </compset>
 
   <compset>
     <alias>CMPASO-JRA1p5-ISMF</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
     <support_level>Experimental, under development</support_level>
   </compset>
 
   <compset>
     <alias>CMPASO-JRA1p5-ISMF-TMIX</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCEDTMIX_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
     <support_level>Experimental, under development</support_level>
   </compset>
 

From 09cac5bc16100c2838156f1d7a2dbb53baad1573 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Mon, 5 Feb 2024 16:10:22 -0700
Subject: [PATCH 18/27] add Jourdain defaults for TMIX, remove redundant
 variables, correct all ISMF and add TMIX when PISMF

---
 components/mpas-ocean/bld/build-namelist      | 14 ++++--
 .../mpas-ocean/bld/build-namelist-section     |  1 -
 .../namelist_defaults_mpaso.xml               |  1 -
 .../namelist_definition_mpaso.xml             |  8 ----
 .../cime_config/config_compsets.xml           | 47 ++++++++++++++-----
 components/mpas-ocean/src/Registry.xml        | 10 ++--
 6 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist
index 4d79d825cd06..955328186fb7 100755
--- a/components/mpas-ocean/bld/build-namelist
+++ b/components/mpas-ocean/bld/build-namelist
@@ -783,6 +783,15 @@ if ($OCN_ISMF eq 'coupled') {
 } else {
 	add_default($nl, 'config_land_ice_flux_mode');
 }
+if ($OCN_TIDAL_MIXING eq 'true') {
+	add_default($nl, 'config_land_ice_flux_tidal_Jourdain_alpha', 'val'=>"0.777");
+	add_default($nl, 'config_land_ice_flux_tidal_Jourdain_A0', 'val'=>"0.656");
+	add_default($nl, 'config_land_ice_flux_tidal_Jourdain_U0', 'val'=>"0.003");
+} else {
+	add_default($nl, 'config_land_ice_flux_tidal_Jourdain_alpha');
+	add_default($nl, 'config_land_ice_flux_tidal_Jourdain_A0');
+	add_default($nl, 'config_land_ice_flux_tidal_Jourdain_U0');
+}
 add_default($nl, 'config_land_ice_flux_formulation');
 add_default($nl, 'config_land_ice_flux_useHollandJenkinsAdvDiff');
 add_default($nl, 'config_land_ice_flux_attenuation_coefficient');
@@ -792,13 +801,8 @@ add_default($nl, 'config_land_ice_flux_cp_ice');
 add_default($nl, 'config_land_ice_flux_rho_ice');
 add_default($nl, 'config_land_ice_flux_explicit_topDragCoeff');
 add_default($nl, 'config_land_ice_flux_ISOMIP_gammaT');
-add_default($nl, 'config_land_ice_flux_rms_tidal_velocity');
 add_default($nl, 'config_land_ice_flux_jenkins_heat_transfer_coefficient');
 add_default($nl, 'config_land_ice_flux_jenkins_salt_transfer_coefficient');
-add_default($nl, 'config_land_ice_flux_tidal_Jourdain_alpha');
-add_default($nl, 'config_land_ice_flux_tidal_Jourdain_A0');
-add_default($nl, 'config_land_ice_flux_tidal_Jourdain_U0');
-
 
 #############################
 # Namelist group: advection #
diff --git a/components/mpas-ocean/bld/build-namelist-section b/components/mpas-ocean/bld/build-namelist-section
index 2f28568119b8..b34d6dcb5438 100644
--- a/components/mpas-ocean/bld/build-namelist-section
+++ b/components/mpas-ocean/bld/build-namelist-section
@@ -302,7 +302,6 @@ add_default($nl, 'config_land_ice_flux_cp_ice');
 add_default($nl, 'config_land_ice_flux_rho_ice');
 add_default($nl, 'config_land_ice_flux_explicit_topDragCoeff');
 add_default($nl, 'config_land_ice_flux_ISOMIP_gammaT');
-add_default($nl, 'config_land_ice_flux_rms_tidal_velocity');
 add_default($nl, 'config_land_ice_flux_jenkins_heat_transfer_coefficient');
 add_default($nl, 'config_land_ice_flux_jenkins_salt_transfer_coefficient');
 add_default($nl, 'config_land_ice_flux_tidal_Jourdain_alpha');
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
index 091a519caab0..294db32cbe66 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
@@ -405,7 +405,6 @@
 <config_land_ice_flux_explicit_topDragCoeff ocn_grid="FRISwISC02to60E3r1">4.48e-3</config_land_ice_flux_explicit_topDragCoeff>
 <config_land_ice_flux_explicit_topDragCoeff ocn_grid="FRISwISC01to60E3r1">4.48e-3</config_land_ice_flux_explicit_topDragCoeff>
 <config_land_ice_flux_ISOMIP_gammaT>1e-4</config_land_ice_flux_ISOMIP_gammaT>
-<config_land_ice_flux_rms_tidal_velocity>5e-2</config_land_ice_flux_rms_tidal_velocity>
 <config_land_ice_flux_jenkins_heat_transfer_coefficient>0.011</config_land_ice_flux_jenkins_heat_transfer_coefficient>
 <config_land_ice_flux_jenkins_heat_transfer_coefficient ocn_grid="oEC60to30v3wLI">0.00295</config_land_ice_flux_jenkins_heat_transfer_coefficient>
 <config_land_ice_flux_jenkins_heat_transfer_coefficient ocn_grid="ECwISC30to60E1r2">0.00295</config_land_ice_flux_jenkins_heat_transfer_coefficient>
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
index cf2dd6cadf3b..c990bbf8452b 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
@@ -1590,14 +1590,6 @@ Valid values: Any positive real number
 Default: Defined in namelist_defaults.xml
 </entry>
 
-<entry id="config_land_ice_flux_rms_tidal_velocity" type="real"
-	category="land_ice_fluxes" group="land_ice_fluxes">
-Parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity
-
-Valid values: Any non-negative real number
-Default: Defined in namelist_defaults.xml
-</entry>
-
 <entry id="config_land_ice_flux_jenkins_heat_transfer_coefficient" type="real"
 	category="land_ice_fluxes" group="land_ice_fluxes">
 constant nondimensional heat transfer coefficient across the ice-ocean boundary layer
diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml
index d6d835120866..4d425a98d93a 100644
--- a/components/mpas-ocean/cime_config/config_compsets.xml
+++ b/components/mpas-ocean/cime_config/config_compsets.xml
@@ -34,14 +34,20 @@
   </compset>
 
   <compset>
-    <alias>CMPASO-JRA1p5-ISMF</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
+    <alias>CMPASO-JRA1p5-PISMF</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%PISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
     <support_level>Experimental, under development</support_level>
   </compset>
 
   <compset>
-    <alias>CMPASO-JRA1p5-ISMF-TMIX</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%ISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
+    <alias>CMPASO-JRA1p5-DISMF</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%DISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
+    <support_level>Experimental, under development</support_level>
+  </compset>
+
+  <compset>
+    <alias>CMPASO-JRA1p5-PISMF-TMIX</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%PISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
     <support_level>Experimental, under development</support_level>
   </compset>
 
@@ -61,8 +67,8 @@
   </compset>
 
   <compset>
-    <alias>GMPAS-NYF-ISMF-TMIX</alias>
-    <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%ISMFDATMFORCEDTMIX_DROF%NYFAIS45_SGLC_SWAV</lname>
+    <alias>GMPAS-NYF-PISMF-TMIX</alias>
+    <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%PISMFDATMFORCEDTMIX_DROF%NYFAIS45_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -115,6 +121,11 @@
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
   </compset>
 
+    <compset>
+    <alias>GMPAS-JRA1p4-PISMF-TMIX</alias>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%PISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-JRA1p4-DIB</alias>
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%JRA-1p4-2018-AIS0ICE_SGLC_SWAV</lname>
@@ -130,6 +141,11 @@
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
   </compset>
 
+    <compset>
+    <alias>GMPAS-JRA1p4-DIB-PISMF-TMIX</alias>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-IAF-PISMF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
@@ -141,13 +157,8 @@
   </compset>
 
   <compset>
-    <alias>GMPAS-JRA1p4-DIB-PISMF-TMIX</alias>
-    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>GMPAS-IAF-ISMF-TMIX</alias>
-    <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%ISMFDATMFORCEDTMIX_DROF%IAFAIS45_SGLC_SWAV</lname>
+    <alias>GMPAS-IAF-PISMF-TMIX</alias>
+    <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCEDTMIX_DROF%IAFAIS45_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -165,6 +176,11 @@
     <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%NYFAIS00_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-DIB-NYF-PISMF-TMIX</alias>
+    <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%NYFAIS00_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-DIB-IAF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%IAFAIS55_SGLC_SWAV</lname>
@@ -180,6 +196,11 @@
     <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%IAFAIS00_SGLC_SWAV</lname>
   </compset>
 
+    <compset>
+    <alias>GMPAS-DIB-IAF-PISMF-TMIX</alias>
+    <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%IAFAIS00_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-MALI-DIB-IAF-DISMF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV</lname>
diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
index e3e9d3150f4a..1c4e2e68147d 100644
--- a/components/mpas-ocean/src/Registry.xml
+++ b/components/mpas-ocean/src/Registry.xml
@@ -1011,10 +1011,6 @@
 					description="The constant heat transport velocity through the boundary layer under land ice used in the ISOMIP test cases."
 					possible_values="Any positive real number"
 		/>
-		<nml_option name="config_land_ice_flux_rms_tidal_velocity" type="real" default_value="5e-2" units="m s^-1"
-					description="Parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity (overwritten by Jourdain parameterization)"
-					possible_values="Any non-negative real number"
-		/>
 		<nml_option name="config_land_ice_flux_jenkins_heat_transfer_coefficient" type="real" default_value="0.011"
 					description="constant nondimensional heat transfer coefficient across the ice-ocean boundary layer"
 					possible_values="Any positive real number"
@@ -1024,15 +1020,15 @@
 					possible_values="Any positive real number"
 		/>
 		<nml_option name="config_land_ice_flux_tidal_Jourdain_alpha" type="real" default_value="1"
-					description="alpha from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, alpha = 0.777"
+					description="alpha from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, alpha = 0.777 when TMIX compset on"
 					possible_values="Any non-negative real number"
 		/>
 		<nml_option name="config_land_ice_flux_tidal_Jourdain_A0" type="real" default_value="0"
-					description="A0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, A0 = 0.656"
+					description="A0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, A0 = 0.656 when TMIX compset on"
 					possible_values="Any non-negative real number"
 		/>
 		<nml_option name="config_land_ice_flux_tidal_Jourdain_U0" type="real" default_value="5e-2" units="m s^-1"
-					description="U0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, U0 = 0.003 m/s"
+					description="U0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, U0 = 0.003 m/s when TMIX compset on"
 					possible_values="Any non-negative real number"
 		/>
 	</nml_record>

From c1c717fd5ccb347cd8123d30cebaaf9b2bfa2973 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Tue, 26 Mar 2024 14:01:43 -0600
Subject: [PATCH 19/27] resolve

---
 components/mpas-ocean/cime_config/buildnml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index baf621f152ec..b464a3c6110f 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -75,6 +75,7 @@ def buildnml(case, caseroot, compname):
     data_ismf_file = ''
     analysis_mask_file = ''
     eco_forcing_file = ''
+    u_tidal_rms_file = ''
 
     if ocn_grid == 'oEC60to30v3':
         decomp_date = '230424'
@@ -131,11 +132,12 @@ def buildnml(case, caseroot, compname):
         decomp_date = '230422'
         decomp_prefix = 'partitions/mpas-o.graph.info.'
         ic_date = '230220'
-        u_tidal_rms_file = 'oQU240wLI_velocityTidalRMS_CATS2008.nc'
         ic_prefix = 'ocean.QU.240wLI'
         if ocn_ic_mode == 'spunup':
             logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case")
             logger.warning("         But no file available for this grid.")
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'oQU240wLI_velocityTidalRMS_CATS2008.nc'
 
     elif ocn_grid == 'oQU120':
         decomp_date = '230424'
@@ -265,13 +267,14 @@ def buildnml(case, caseroot, compname):
         restoring_file = 'sss.PHC2_monthlyClimatology.SOwISC12to60E2r4_nomask.210120.nc'
         analysis_mask_file = 'SOwISC12to60E2r4_mocBasinsAndTransects20210623.nc'
         ic_date = '230220'
-        u_tidal_rms_file = 'SOwISC12to60E2r4_velocityTidalRMS_CATS2008.nc'
         ic_prefix = 'ocean.SOwISC12to60E2r4'
         if ocn_ic_mode == 'spunup':
             ic_date = '230220'
             ic_prefix = 'mpaso.SOwISC12to60E2r4.rstFromG-anvil'
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.SOwISC12to60E2r4.230516.nc'
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'SOwISC12to60E2r4_velocityTidalRMS_CATS2008.nc'
 
     elif ocn_grid == 'FRISwISC08to60E3r1':
         decomp_date = '20230913'  # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC08to60E3r1/partitions
@@ -331,13 +334,14 @@ def buildnml(case, caseroot, compname):
         restoring_file = 'sss.PHC2_monthlyClimatology.ECwISC30to60E2r1_nomask.201221.nc'
         analysis_mask_file = 'ECwISC30to60E2r1_mocBasinsAndTransects20210623.nc'
         ic_date = '230220'
-        u_tidal_rms_file = 'ECwISC30to60E2r1_velocityTidalRMS_CATS2008.nc'
         ic_prefix = 'ocean.ECwISC30to60E2r1'
         if ocn_ic_mode == 'spunup':
             ic_date = '230220'
             ic_prefix = 'mpaso.ECwISC30to60E2r1.rstFromG-anvil'
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E2r1.230429.nc'
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'ECwISC30to60E2r1_velocityTidalRMS_CATS2008.nc'
 
     elif ocn_grid == 'IcoswISC30E3r5':
         decomp_date = '20231120'
@@ -355,6 +359,8 @@ def buildnml(case, caseroot, compname):
             eco_forcing_file = 'ecoForcingSurfaceMonthly.IcoswISC30E3r5.20231215.nc'
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_paolo2023.IcoswISC30E3r5.20240227.nc'
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'IcoswISC30E3r5_velocityTidalRMS_CATS2008.nc'
 
     #--------------------------------------------------------------------
     # Set OCN_FORCING = datm_forced_restoring if restoring file is available
@@ -392,7 +398,7 @@ def buildnml(case, caseroot, compname):
         if data_ismf_file != '':
             input_list.write("data_ismf = {}/ocn/mpas-o/{}/{}\n".format(din_loc_root, ocn_mask, data_ismf_file))
 
-        if ocn_tidal_mixing == 'true':
+        if u_tidal_rms_file != '':
             input_list.write("u_tidal_rms = {}/ocn/mpas-o/{}/{}\n".format(din_loc_root, ocn_mask, u_tidal_rms_file))
 
     #--------------------------------------------------------------------
@@ -643,7 +649,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('</stream>')
                 lines.append('')
 
-            if ocn_tidal_mixing == 'true':
+            if u_tidal_rms_file != '':
                 lines.append('<stream name="tidal_velocity_rms_parameterized"')
                 lines.append('       type="input"')
                 lines.append('       io_type="{}"'.format(ocn_pio_typename))

From a177ec21e43625f689c7d4cbe2ccf66e59fbf58b Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Tue, 6 Feb 2024 12:09:03 -0700
Subject: [PATCH 20/27] add velocityTidalRMS to monthly output

---
 components/mpas-ocean/cime_config/buildnml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index b464a3c6110f..8c8042cdc27e 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -1351,6 +1351,7 @@ def buildnml(case, caseroot, compname):
             lines.append('    <var_array name="activeTracerVerticalAdvectionTopFlux"/>')
             lines.append('    <var_array name="activeTracerHorizontalAdvectionEdgeFlux"/>')
             lines.append('    <var_array name="totalFreshWaterTemperatureFlux"/>')
+            lines.append('    <var name="velocityTidalRMS"/>')
             if ocn_iceberg == 'true':
                 lines.append('    <var name="icebergHeatFlux"/>')
                 lines.append('    <var name="icebergFreshWaterFlux"/>')

From 1fe8bbd1724cce4d67daaea8b94da8d9654f0dc9 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Tue, 13 Feb 2024 02:45:06 -0600
Subject: [PATCH 21/27] Add CRYO1850-TMIX and CRYO1950-TMIX compsets

---
 cime_config/allactive/config_compsets.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml
index 637facc327d7..98dc267f158a 100755
--- a/cime_config/allactive/config_compsets.xml
+++ b/cime_config/allactive/config_compsets.xml
@@ -353,6 +353,16 @@
   <lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>CRYO1850-TMIX</alias>
+  <lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMFTMIX_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>CRYO1950-TMIX</alias>
+  <lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMFTMIX_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>CRYO20TR</alias>
   <lname>20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>

From b50d180592859a3f59028e07b1951a901596328c Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Wed, 21 Feb 2024 15:32:31 -0700
Subject: [PATCH 22/27] Updated tidal mixing files and filenames that were
 regenerated with compass

---
 components/mpas-ocean/cime_config/buildnml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 8c8042cdc27e..eafe029e2aed 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -137,7 +137,7 @@ def buildnml(case, caseroot, compname):
             logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case")
             logger.warning("         But no file available for this grid.")
         if ocn_tidal_mixing == 'true':
-            u_tidal_rms_file = 'oQU240wLI_velocityTidalRMS_CATS2008.nc'
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.oQU240wLI.20240221.nc'
 
     elif ocn_grid == 'oQU120':
         decomp_date = '230424'
@@ -274,7 +274,7 @@ def buildnml(case, caseroot, compname):
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.SOwISC12to60E2r4.230516.nc'
         if ocn_tidal_mixing == 'true':
-            u_tidal_rms_file = 'SOwISC12to60E2r4_velocityTidalRMS_CATS2008.nc'
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.SOwISC12to60E2r4.20210114.nc'
 
     elif ocn_grid == 'FRISwISC08to60E3r1':
         decomp_date = '20230913'  # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC08to60E3r1/partitions
@@ -341,7 +341,7 @@ def buildnml(case, caseroot, compname):
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E2r1.230429.nc'
         if ocn_tidal_mixing == 'true':
-            u_tidal_rms_file = 'ECwISC30to60E2r1_velocityTidalRMS_CATS2008.nc'
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.ECwISC30to60E2r1.20240221.nc'
 
     elif ocn_grid == 'IcoswISC30E3r5':
         decomp_date = '20231120'
@@ -360,7 +360,7 @@ def buildnml(case, caseroot, compname):
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_paolo2023.IcoswISC30E3r5.20240227.nc'
         if ocn_tidal_mixing == 'true':
-            u_tidal_rms_file = 'IcoswISC30E3r5_velocityTidalRMS_CATS2008.nc'
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.IcoswISC30E3r5.20231120.nc'
 
     #--------------------------------------------------------------------
     # Set OCN_FORCING = datm_forced_restoring if restoring file is available

From 70b4d727177a0a7703a21585697d120c515401c4 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Tue, 26 Mar 2024 12:54:19 -0600
Subject: [PATCH 23/27] remove short names compsets

---
 cime_config/allactive/config_compsets.xml     | 10 ----
 .../cime_config/config_compsets.xml           | 54 -------------------
 2 files changed, 64 deletions(-)

diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml
index 98dc267f158a..637facc327d7 100755
--- a/cime_config/allactive/config_compsets.xml
+++ b/cime_config/allactive/config_compsets.xml
@@ -353,16 +353,6 @@
   <lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
-<compset>
-  <alias>CRYO1850-TMIX</alias>
-  <lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMFTMIX_MOSART_SGLC_SWAV</lname>
-</compset>
-
-<compset>
-  <alias>CRYO1950-TMIX</alias>
-  <lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMFTMIX_MOSART_SGLC_SWAV</lname>
-</compset>
-
 <compset>
   <alias>CRYO20TR</alias>
   <lname>20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml
index 4d425a98d93a..689f208713b1 100644
--- a/components/mpas-ocean/cime_config/config_compsets.xml
+++ b/components/mpas-ocean/cime_config/config_compsets.xml
@@ -27,30 +27,6 @@
     <support_level>Experimental, under development</support_level>
   </compset>
 
-  <compset>
-    <alias>CMPASO-JRA1p5</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%DATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
-    <support_level>Experimental, under development</support_level>
-  </compset>
-
-  <compset>
-    <alias>CMPASO-JRA1p5-PISMF</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%PISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
-    <support_level>Experimental, under development</support_level>
-  </compset>
-
-  <compset>
-    <alias>CMPASO-JRA1p5-DISMF</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%DISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
-    <support_level>Experimental, under development</support_level>
-  </compset>
-
-  <compset>
-    <alias>CMPASO-JRA1p5-PISMF-TMIX</alias>
-    <lname>2000_DATM%JRA-1p5_SLND_DICE%SSMI_MPASO%PISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
-    <support_level>Experimental, under development</support_level>
-  </compset>
-
   <compset>
     <alias>GMPAS-NYF</alias>
     <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%DATMFORCED_DROF%NYF_SGLC_SWAV</lname>
@@ -66,11 +42,6 @@
     <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%NYFAIS45_SGLC_SWAV</lname>
   </compset>
 
-  <compset>
-    <alias>GMPAS-NYF-PISMF-TMIX</alias>
-    <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%PISMFDATMFORCEDTMIX_DROF%NYFAIS45_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>GMPAS-IAF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%DATMFORCED_DROF%IAF_SGLC_SWAV</lname>
@@ -121,11 +92,6 @@
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
   </compset>
 
-    <compset>
-    <alias>GMPAS-JRA1p4-PISMF-TMIX</alias>
-    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%PISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>GMPAS-JRA1p4-DIB</alias>
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%JRA-1p4-2018-AIS0ICE_SGLC_SWAV</lname>
@@ -141,11 +107,6 @@
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
   </compset>
 
-    <compset>
-    <alias>GMPAS-JRA1p4-DIB-PISMF-TMIX</alias>
-    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>GMPAS-IAF-PISMF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
@@ -156,11 +117,6 @@
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
   </compset>
 
-  <compset>
-    <alias>GMPAS-IAF-PISMF-TMIX</alias>
-    <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCEDTMIX_DROF%IAFAIS45_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>GMPAS-DIB-NYF</alias>
     <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%NYFAIS55_SGLC_SWAV</lname>
@@ -176,11 +132,6 @@
     <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%NYFAIS00_SGLC_SWAV</lname>
   </compset>
 
-  <compset>
-    <alias>GMPAS-DIB-NYF-PISMF-TMIX</alias>
-    <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%NYFAIS00_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>GMPAS-DIB-IAF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%IAFAIS55_SGLC_SWAV</lname>
@@ -196,11 +147,6 @@
     <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%IAFAIS00_SGLC_SWAV</lname>
   </compset>
 
-    <compset>
-    <alias>GMPAS-DIB-IAF-PISMF-TMIX</alias>
-    <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%IAFAIS00_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>GMPAS-MALI-DIB-IAF-DISMF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV</lname>

From d4fb283b09932d1af2d251d352c20123cdc16bb7 Mon Sep 17 00:00:00 2001
From: Irena Vankova <irena.vanek@gmail.com>
Date: Tue, 26 Mar 2024 16:39:44 -0600
Subject: [PATCH 24/27] add tidal files for FRIS meshes

---
 components/mpas-ocean/cime_config/buildnml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index eafe029e2aed..ea5a8706edea 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -288,6 +288,8 @@ def buildnml(case, caseroot, compname):
             ic_prefix = 'mpaso.FRISwISC08to60E3r1.rstFromG-anvil'   # the spun up file does not yet exist
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC08to60E3r1.20230913.nc'
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.FRISwISC08to60E3r1.20230913.nc'
 
     elif ocn_grid == 'FRISwISC04to60E3r1':
         decomp_date = '20230913'  # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC04to60E3r1/partitions
@@ -301,6 +303,8 @@ def buildnml(case, caseroot, compname):
             ic_prefix = 'mpaso.FRISwISC04to60E3r1.rstFromG-anvil'   # the spun up file does not yet exist
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC04to60E3r1.20230913.nc'
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.FRISwISC04to60E3r1.20230913.nc'
 
     elif ocn_grid == 'FRISwISC02to60E3r1':
         decomp_date = '20230914'  # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC02to60E3r1/partitions
@@ -314,6 +318,8 @@ def buildnml(case, caseroot, compname):
             ic_prefix = 'mpaso.FRISwISC02to60E3r1.rstFromG-anvil'   # the spun up file does not yet exist
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC02to60E3r1.20230914.nc'
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.FRISwISC02to60E3r1.20230914.nc'
 
     elif ocn_grid == 'FRISwISC01to60E3r1':
         decomp_date = '20230915'  # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC01to60E3r1/partitions
@@ -327,6 +333,8 @@ def buildnml(case, caseroot, compname):
             ic_prefix = 'mpaso.FRISwISC01to60E3r1.rstFromG-anvil'   # the spun up file does not yet exist
         if ocn_ismf == 'data':
             data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC01to60E3r1.20230915.nc'
+        if ocn_tidal_mixing == 'true':
+            u_tidal_rms_file = 'velocityTidalRMS_CATS2008.FRISwISC01to60E3r1.20230915.nc'
 
     elif ocn_grid == 'ECwISC30to60E2r1':
         decomp_date = '200915'

From 203a45eb0f7329fd3dd2c4a968767d72e888274b Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 28 Mar 2024 12:02:01 -0500
Subject: [PATCH 25/27] Add a test with the TMIX compset

---
 cime_config/tests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cime_config/tests.py b/cime_config/tests.py
index ab5fa2ce9493..c2359edbdbca 100644
--- a/cime_config/tests.py
+++ b/cime_config/tests.py
@@ -239,6 +239,7 @@
         "tests" : (
             "ERS_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF.mpaso-jra_1958",
             "PEM_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF.mpaso-jra_1958",
+            "SMS_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF-TMIX.mpaso-jra_1958",
             "SMS.ne30_oECv3_gis.IGELM_MLI.elm-extrasnowlayers",
             )
         },

From 1ddd29726f2c2d757ed39a7eb1cdb854fb4c973d Mon Sep 17 00:00:00 2001
From: Irena Vankova <irkova@bas.ac.uk>
Date: Tue, 28 May 2024 12:16:10 -0600
Subject: [PATCH 26/27] remove new registry variables from
 namelist_definition_mpaso.xml

---
 .../namelist_definition_mpaso.xml             | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
index c990bbf8452b..10f29cb6e056 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
@@ -1606,30 +1606,6 @@ Valid values: Any positive real number
 Default: Defined in namelist_defaults.xml
 </entry>
 
-<entry id="config_land_ice_flux_tidal_Jourdain_alpha" type="real"
-	category="land_ice_fluxes" group="land_ice_fluxes">
-Constant in parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity
-
-Valid values: Any positive real number
-Default: Defined in namelist_defaults.xml
-</entry>
-
-<entry id="config_land_ice_flux_tidal_Jourdain_A0" type="real"
-	category="land_ice_fluxes" group="land_ice_fluxes">
-Constant in parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity
-
-Valid values: Any positive real number
-Default: Defined in namelist_defaults.xml
-</entry>
-
-<entry id="config_land_ice_flux_tidal_Jourdain_U0" type="real"
-	category="land_ice_fluxes" group="land_ice_fluxes">
-Constant in parameterization of tidal velocity used in computing the sub-ice-shelf friction velocity
-
-Valid values: Any positive real number
-Default: Defined in namelist_defaults.xml
-</entry>
-
 
 <!-- advection -->
 

From bd446b2961d06ed57c390d425717f239e672cda3 Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Tue, 28 May 2024 13:55:57 -0500
Subject: [PATCH 27/27] Update bld files to match Registry

---
 .../namelist_definition_mpaso.xml             | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
index 10f29cb6e056..7c391e04929e 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
@@ -1606,6 +1606,30 @@ Valid values: Any positive real number
 Default: Defined in namelist_defaults.xml
 </entry>
 
+<entry id="config_land_ice_flux_tidal_Jourdain_alpha" type="real"
+	category="land_ice_fluxes" group="land_ice_fluxes">
+alpha from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, alpha = 0.777 when TMIX compset on
+
+Valid values: Any non-negative real number
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_land_ice_flux_tidal_Jourdain_A0" type="real"
+	category="land_ice_fluxes" group="land_ice_fluxes">
+A0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, A0 = 0.656 when TMIX compset on
+
+Valid values: Any non-negative real number
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_land_ice_flux_tidal_Jourdain_U0" type="real"
+	category="land_ice_fluxes" group="land_ice_fluxes">
+U0 from parameterization of tidal velocity by Jourdain et al., 2019 - Equation 9, U0 = 0.003 m/s when TMIX compset on
+
+Valid values: Any non-negative real number
+Default: Defined in namelist_defaults.xml
+</entry>
+
 
 <!-- advection -->