Merge branch 'ocean/AddStokesTerms_ADC' into ocean/addADCMixing

Author: BrodiePearson

src/core_ocean/adc_mixing/Registry_adc_mixing_fields_opts.xml

@@ -32,7 +32,7 @@
           possible_values="positive real numbers"
           />
   <nml_option name="config_adc_stokes_angle" type="real" default_value="0.0" units="radians"
-          description="Angle between wind and waves (surface stress and surface Stokes drift vector respectively). Positive values denote waves to the left of the wind. NOTE: units are RADIANS."
+          description="Angle between wind and waves (surface stress and surface Stokes drift vector respectively). Positive values denote waves to the left of the wind."
           possible_values="positive or negative real numbers"
           />
   <nml_option name="config_adc_tau_o" type="real" default_value="1800" units="s^{-1}"

src/core_ocean/shared/mpas_ocn_adcReconstruct.F

@@ -182,7 +182,7 @@ subroutine compute_ADC_tends(nCells,nVertLevels, nTracers, dt,activeTracers, uve
 
       real(kind=RKIND),dimension(nVertLevels,nCells) :: Swumd
       real(kind=RKIND),dimension(nVertLevels,nCells) :: tauw3, tau_tracer, tauVel, tauvVel
-      real(kind=RKIND),dimension(nVertLevels,nCells) :: uStokes, vStokes
+      real(kind=RKIND),dimension(nVertLevels,nCells) :: uStokes, vStokes, uStokesm, vStokesm
       real(kind=RKIND),dimension(nVertLevels,nCells) :: areaFractionMid, tumdMid, McMid, wumdMid, sumdMid
 
       real(kind=RKIND) :: SwU, SwD, tau_sfc, d_sqrt_wp2_dz, tp2, sp2, min_wp2_sfc_val, wp2_splat_sfc_correction
@@ -233,11 +233,13 @@ subroutine compute_ADC_tends(nCells,nVertLevels, nTracers, dt,activeTracers, uve
 !             La_t = (friction velocity / surface stokes drift magnitude)^(0.5) and the
 !             stokes_angle (angle between surface stress and Stokes drift vectors)
 
-              uStokes(1,iCell) = uStokes_surf
-              vStokes(1,iCell) = vStokes_surf
               do k=1,nVertLevels
+!                Calculate Stokes drift at vertical edge of cells
                  uStokes(k,iCell) = uStokes_surf*EXP(ze(k,iCell)/stokes_depth)
                  vStokes(k,iCell) = vStokes_surf*EXP(ze(k,iCell)/stokes_depth)
+!                Calculate Stokes drift at vertical midpoint of cells
+                 uStokesm(k,iCell) = uStokes_surf*EXP(zm(k,iCell)/stokes_depth)
+                 vStokesm(k,iCell) = vStokes_surf*EXP(zm(k,iCell)/stokes_depth)
               enddo
 
               do k=1,3
@@ -470,6 +472,7 @@ subroutine compute_ADC_tends(nCells,nVertLevels, nTracers, dt,activeTracers, uve
                 SwD = -(1.0_RKIND-2.0_RKIND*areaFraction(k+1,iCell)) &
                    /(areaFraction(k+1,iCell)*(1.0_RKIND-areaFraction(k+1,iCell)))**0.5_RKIND
 
+!    Calculate Stokes drift derivatives at vertical cell centers (where w3 is located)
                 Ustz = (uStokes(k,iCell) - uStokes(k+1,iCell)) / dz
                 Vstz = (vStokes(k,iCell) - vStokes(k+1,iCell)) / dz
 
@@ -546,8 +549,9 @@ subroutine compute_ADC_tends(nCells,nVertLevels, nTracers, dt,activeTracers, uve
 
                  Uz = (uvel(k-1,iCell) - uvel(k,iCell)) / dzmid
                  Vz = (vvel(k-1,iCell) - vvel(k,iCell)) / dzmid
-                 Ustz = (uStokes(k-1,iCell) - uStokes(k,iCell)) / dzmid
-                 Vstz = (vStokes(k-1,iCell) - vStokes(k,iCell)) / dzmid
+!    Calculate Stokes drift derivatives at vertical cell edges (where w2 etc. are located)
+                 Ustz = (uStokesm(k-1,iCell) - uStokesm(k,iCell)) / dzmid
+                 Vstz = (vStokesm(k-1,iCell) - vStokesm(k,iCell)) / dzmid
                  Tz = (activeTracers(1,k-1,iCell) - activeTracers(1,k,iCell)) / dzmid
                  Sz = (activeTracers(2,k-1,iCell) - activeTracers(2,k,iCell)) / dzmid