Merge branch 'mark-petersen/ocn/remove-unused-variables' (PR #5610)

Remove unused variables in ocean The variables tidalPotentialZMid and nTidalPotentialConstituents are defined in the Registry but not used for any computations. This tricks the gnu compiler in optimized mode, which removes them internally. The simulation then dies when the i/o references these variables on initialization. Fixes #5609 [BFB]
E3SM-Project · Apr 28, 2023 · de075c7 · de075c7
2 parents 7ab58cf + fc282e7
commit de075c7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
@@ -3736,10 +3736,6 @@
 			description="Equilibrium tidal potential"
 			packages="forwardMode"
 		/>
-		<var name="nTidalPotentialConstituents" type="integer" dimensions="Time"
-			description="Number of tidal constituents"
-			packages="tidalPotentialForcingPKG"
-		/>
 		<var name="tidalPotentialConstituentFrequency" type="real" dimensions="maxTidalConstituents Time" units="s^-1"
 			description="Frequency of tidal constituents"
 			packages="tidalPotentialForcingPKG"
@@ -3772,10 +3768,6 @@
 			description="Latitude function for tidal constituents: long-period = 3\sin^2(\phi)-1, diurnal = \sin(2\phi), semi-diurnal = \cos^2(\phi)"
 			packages="tidalPotentialForcingPKG"
 		/>
-		<var name="tidalPotentialZMid" type="real" dimensions="nVertLevels nCells Time" units="m"
-			description="zMid - Equilibrium tidal potential in RK4"
-			packages="tidalPotentialForcingPKG"
-		/>
 		<var name="sshSubcycleCurWithTides" type="real" dimensions="nCells Time" units="m"
 			description="SSH - tidal potential in split explicit "
 			packages="tidalPotentialForcingPKG"

diff --git a/components/mpas-ocean/src/shared/mpas_ocn_vel_tidal_potential.F b/components/mpas-ocean/src/shared/mpas_ocn_vel_tidal_potential.F
@@ -313,7 +313,6 @@ subroutine ocn_vel_tidal_potential_init(domain,err)!{{{
       type (mpas_pool_type), pointer :: forcingPool
       type (mpas_pool_type), pointer :: meshPool
       integer, pointer :: nCells
-      integer, pointer :: nTidalPotentialConstituents
       real (kind=RKIND), dimension(:), pointer :: latCell
 
       ! End preamble
@@ -358,9 +357,6 @@ subroutine ocn_vel_tidal_potential_init(domain,err)!{{{
          call mpas_pool_get_array(forcingPool, 'tidalPotentialEta', &
                                                 tidalPotEta)
 
-         call mpas_pool_get_array(forcingPool, &
-                            'nTidalPotentialConstituents', &
-                             nTidalPotentialConstituents)
          call mpas_pool_get_array(forcingPool, &
                             'tidalPotentialConstituentAmplitude', & 
                              tidalConstituentAmplitude)
@@ -434,9 +430,6 @@ subroutine ocn_vel_tidal_potential_init(domain,err)!{{{
             constituentList(nTidalConstituents)%constituent = 'P1'
          end if 
 
-         ! set point value in forcing pool just in case
-         nTidalPotentialConstituents = nTidalConstituents
-
          call tidal_constituent_factors(constituentList, &
                                        nTidalConstituents, refTime, &
                                        tidalConstituentFrequency, &