Revert "Merge branch 'jonbob/ocn/add-akt-tilt-coupling' into next (PR #…

…1278)" This reverts commit 80ff3aa, reversing changes made to 1e30505. There were problems with exact restart testing
E3SM-Project · Feb 23, 2017 · ce5907f · ce5907f
1 parent 3e447b9
commit ce5907f
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 66 deletions.
diff --git a/components/mpas-o/bld/build-namelist b/components/mpas-o/bld/build-namelist
@@ -671,12 +671,6 @@ add_default($nl, 'config_use_bulk_thickness_flux');
 add_default($nl, 'config_flux_attenuation_coefficient');
 add_default($nl, 'config_flux_attenuation_coefficient_runoff');
 
-############################
-# Namelist group: coupling #
-############################
-
-add_default($nl, 'config_ssh_grad_relax_timescale');
-
 ######################################
 # Namelist group: shortwaveRadiation #
 ######################################
@@ -1800,7 +1794,6 @@ my @groups = qw(run_modes
                 vmix_tanh
                 cvmix
                 forcing
-                coupling
                 shortwaveradiation
                 frazil_ice
                 land_ice_fluxes

diff --git a/components/mpas-o/bld/build-namelist-group-list b/components/mpas-o/bld/build-namelist-group-list
@@ -23,7 +23,6 @@ my @groups = qw(run_modes
                 vmix_tanh
                 cvmix
                 forcing
-                coupling
                 shortwaveradiation
                 frazil_ice
                 land_ice_fluxes

diff --git a/components/mpas-o/bld/build-namelist-section b/components/mpas-o/bld/build-namelist-section
@@ -258,12 +258,6 @@ add_default($nl, 'config_use_bulk_thickness_flux');
 add_default($nl, 'config_flux_attenuation_coefficient');
 add_default($nl, 'config_flux_attenuation_coefficient_runoff');
 
-############################
-# Namelist group: coupling #
-############################
-
-add_default($nl, 'config_ssh_grad_relax_timescale');
-
 ######################################
 # Namelist group: shortwaveRadiation #
 ######################################

diff --git a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
@@ -227,9 +227,6 @@
 <config_flux_attenuation_coefficient>0.001</config_flux_attenuation_coefficient>
 <config_flux_attenuation_coefficient_runoff>10.0</config_flux_attenuation_coefficient_runoff>
 
-<!-- coupling -->
-<config_ssh_grad_relax_timescale>86400.0</config_ssh_grad_relax_timescale>
-
 <!-- shortwaveRadiation -->
 <config_sw_absorption_type>'jerlov'</config_sw_absorption_type>
 <config_jerlov_water_type>3</config_jerlov_water_type>

diff --git a/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml
@@ -1157,17 +1157,6 @@ Default: Defined in namelist_defaults.xml
 </entry>
 
 
-<!-- coupling -->
-
-<entry id="config_ssh_grad_relax_timescale" type="real"
-	category="coupling" group="coupling">
-Timescale for relaxation of the ssh gradient for coupling. A value of 0.0 removes any relaxation and gives instantaneous response.
-
-Valid values: Any positive real number.
-Default: Defined in namelist_defaults.xml
-</entry>
-
-
 <!-- shortwaveRadiation -->
 
 <entry id="config_sw_absorption_type" type="char*1024"

diff --git a/components/mpas-o/driver/ocn_comp_mct.F b/components/mpas-o/driver/ocn_comp_mct.F
@@ -1884,7 +1884,6 @@ subroutine ocn_export_mct(o2x_o, errorCode)   !{{{
    integer, dimension(:), pointer :: landIceMask
 
    real (kind=RKIND), dimension(:), pointer :: seaIceEnergy, accumulatedFrazilIceMass, frazilSurfacePressure, &
-                                               filteredSSHGradientZonal, filteredSSHGradientMeridional, &
                                                CO2Flux, DMSFlux, surfaceUpwardCO2Flux, &
                                                avgOceanSurfaceDIC, &
                                                avgOceanSurfaceDON, &
@@ -1909,17 +1908,8 @@ subroutine ocn_export_mct(o2x_o, errorCode)   !{{{
                        config_use_DMSTracers_sea_ice_coupling,  &
                        config_use_MacroMoleculesTracers_sea_ice_coupling
 
-   real(kind=RKIND), pointer :: &
-        config_ssh_grad_relax_timescale
-
-   real(kind=RKIND) :: &
-        timeFilterFactor
-
    logical :: keepFrazil
 
-   ! flag to check if this is the first export to allow setting of relaxed coupling variables.
-   logical :: firstExport = .true.
-
    errorcode = 0
 
    ! get configure options
@@ -1933,8 +1923,6 @@ subroutine ocn_export_mct(o2x_o, errorCode)   !{{{
                                                 config_use_DMSTracers_sea_ice_coupling)
    call mpas_pool_get_config(domain % configs, 'config_use_MacroMoleculesTracers_sea_ice_coupling',  &
                                                 config_use_MacroMoleculesTracers_sea_ice_coupling)
-   call mpas_pool_get_config(domain % configs, 'config_ssh_grad_relax_timescale', &
-                                                config_ssh_grad_relax_timescale)
 
    n = 0
    block_ptr => domain % blocklist
@@ -1960,8 +1948,6 @@ subroutine ocn_export_mct(o2x_o, errorCode)   !{{{
      call mpas_pool_get_array(forcingPool, 'avgTracersSurfaceValue', avgTracersSurfaceValue)
      call mpas_pool_get_array(forcingPool, 'avgSurfaceVelocity', avgSurfaceVelocity)
      call mpas_pool_get_array(forcingPool, 'avgSSHGradient', avgSSHGradient)
-     call mpas_pool_get_array(forcingPool, 'filteredSSHGradientZonal', filteredSSHGradientZonal)
-     call mpas_pool_get_array(forcingPool, 'filteredSSHGradientMeridional', filteredSSHGradientMeridional)
      if ( frazilIceActive ) then
         call mpas_pool_get_array(forcingPool, 'seaIceEnergy', seaIceEnergy)
         call mpas_pool_get_array(forcingPool, 'frazilSurfacePressure', frazilSurfacePressure)
@@ -1997,27 +1983,6 @@ subroutine ocn_export_mct(o2x_o, errorCode)   !{{{
 !    call mpas_pool_get_array(forcingPool, 'DMSFlux', DMSFlux)
 !    call mpas_pool_get_array(forcingPool, 'surfaceUpwardCO2Flux', surfaceUpwardCO2Flux)
 
-     ! time filter ssh gradient
-     if (firstExport .and. trim(runtype) == "initial") then
-        filteredSSHGradientZonal     = avgSSHGradient(index_avgZonalSSHGradient,     :)
-        filteredSSHGradientMeridional = avgSSHGradient(index_avgMeridionalSSHGradient, :)
-        firstExport = .false.
-     else
-
-        if (config_ssh_grad_relax_timescale < real(ocn_cpl_dt,RKIND)) then
-           timeFilterFactor = 1.0_RKIND
-        else
-           timeFilterFactor = real(ocn_cpl_dt,RKIND) / config_ssh_grad_relax_timescale
-        endif
-
-        filteredSSHGradientZonal = filteredSSHGradientZonal * (1.0_RKIND - timeFilterFactor) + &
-             avgSSHGradient(index_avgZonalSSHGradient, :) * timeFilterFactor
-
-        filteredSSHGradientMeridional = filteredSSHGradientMeridional * (1.0_RKIND - timeFilterFactor) + &
-             avgSSHGradient(index_avgMeridionalSSHGradient, :) * timeFilterFactor
-
-     endif
-
      do i = 1, nCellsSolve
        n = n + 1
 
@@ -2026,8 +1991,8 @@ subroutine ocn_export_mct(o2x_o, errorCode)   !{{{
        o2x_o % rAttr(index_o2x_So_u, n) = avgSurfaceVelocity(index_avgZonalSurfaceVelocity, i)
        o2x_o % rAttr(index_o2x_So_v, n) = avgSurfaceVelocity(index_avgMeridionalSurfaceVelocity, i)
 
-       o2x_o % rAttr(index_o2x_So_dhdx, n) = filteredSSHGradientZonal(i)
-       o2x_o % rAttr(index_o2x_So_dhdy, n) = filteredSSHGradientMeridional(i)
+       o2x_o % rAttr(index_o2x_So_dhdx, n) = avgSSHGradient(index_avgZonalSSHGradient, i)
+       o2x_o % rAttr(index_o2x_So_dhdy, n) = avgSSHGradient(index_avgMeridionalSSHGradient, i)
        if ( frazilIceActive ) then
           ! negative when frazil ice can be melted
           keepFrazil = .true.

diff --git a/components/mpas-o/model b/components/mpas-o/model