Merge branch 'ocean/fix_Jacobian_from_TS' into hotfix_v3.2

This merge introduces a fix for an issue where an invalid config option
was reference in the model, causing a valid config option to be ignored.

* ocean/fix_Jacobian_from_TS:
  Update common_level_eos to Jacobian_from_TS.

Author: douglasjacobsen

src/core_ocean/mode_forward/mpas_ocn_mpas_core.F

@@ -933,7 +933,7 @@ subroutine mpas_core_setup_packages(configPool, packagePool, ierr)!{{{
          frazilIceActive = .true.
       end if
 
-      if (config_pressure_gradient_type.eq.'common_level_eos') then
+      if (config_pressure_gradient_type.eq.'Jacobian_from_TS') then
          inSituEOSActive = .true.
       end if
 

src/core_ocean/shared/mpas_ocn_diagnostics.F

@@ -471,7 +471,7 @@ subroutine ocn_diagnostic_solve(dt, statePool, forcingPool, meshPool, diagnostic
       call mpas_timer_start("equation of state", .false., diagEOSTimer)
 
       ! compute in-place density
-      if (config_pressure_gradient_type.eq.'common_level_eos') then
+      if (config_pressure_gradient_type.eq.'Jacobian_from_TS') then
          ! only compute EOS derivatives if needed.
          call mpas_pool_get_array(diagnosticsPool, 'inSituThermalExpansionCoeff',inSituThermalExpansionCoeff)
          call mpas_pool_get_array(diagnosticsPool, 'inSituSalineContractionCoeff', inSituSalineContractionCoeff)

src/core_ocean/shared/mpas_ocn_tendency.F

@@ -265,7 +265,7 @@ subroutine ocn_tend_vel(tendPool, statePool, forcingPool, diagnosticsPool, meshP
       ! velocity tendency: pressure gradient
       !
       call mpas_timer_start("pressure grad", .false., velPgradTimer)
-      if (config_pressure_gradient_type.eq.'common_level_eos') then
+      if (config_pressure_gradient_type.eq.'Jacobian_from_TS') then
          ! only pass EOS derivatives if needed.
          call mpas_pool_get_array(diagnosticsPool, 'inSituThermalExpansionCoeff',inSituThermalExpansionCoeff)
          call mpas_pool_get_array(diagnosticsPool, 'inSituSalineContractionCoeff', inSituSalineContractionCoeff)