<p><b>dwj07@fsu.edu</b> 2013-04-15 11:43:49 -0600 (Mon, 15 Apr 2013)</p><p><br>
-- BRANCH COMMMIT --<br>
<br>
Renaming variables:<br>
FBtr -> barotropicThicknessFlux<br>
GBtrForcing -> barotropicForcing<br>
normalVelocityRestoring* -> normalVelocity*<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml 2013-04-15 15:34:56 UTC (rev 2749)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml 2013-04-15 17:43:49 UTC (rev 2750)
@@ -594,10 +594,10 @@
<var name="sshSubcycle" type="real" dimensions="nCells Time" units="m"
description="sea surface height, used in subcycling in stage 2 of split-explicit time-stepping"
/>
- <var name="FBtr" type="real" dimensions="nEdges Time" units="m^2 s^{-1}"
+ <var name="barotropicThicknessFlux" type="real" dimensions="nEdges Time" units="m^2 s^{-1}"
description="Barotropic thickness flux at each edge, used to advance sea surface height in each subcycle of stage 2 of the split-explicit algorithm."
/>
- <var name="GBtrForcing" type="real" dimensions="nEdges Time" units="m s^{-2}"
+ <var name="barotropicForcing" type="real" dimensions="nEdges Time" units="m s^{-2}"
description="Barotropic tendency computed from the baroclinic equations in stage 1 of the split-explicit algorithm."
/>
<var name="normalBaroclinicVelocity" type="real" dimensions="nVertLevels nEdges Time" units="m s^{-1}"
@@ -672,19 +672,19 @@
<var name="kineticEnergyEdge" type="real" dimensions="nVertLevels nEdges Time" units="m^2 s^{-2}"
description="kinetic energy of horizonal velocity defined at edges"
/>
- <var name="normalVelocityReconstructX" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
+ <var name="normalVelocityX" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
description="component of horizontal velocity in the x-direction (cartesian)"
/>
- <var name="normalVelocityReconstructY" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
+ <var name="normalVelocityY" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
description="component of horizontal velocity in the y-direction (cartesian)"
/>
- <var name="normalVelocityReconstructZ" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
+ <var name="normalVelocityZ" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
description="component of horizontal velocity in the z-direction (cartesian)"
/>
- <var name="normalVelocityReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="normalVelocityZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="component of horizontal velocity in the eastward direction"
/>
- <var name="normalVelocityReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="normalVelocityMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="component of horizontal velocity in the northward"
/>
<var name="normalVelocityForcingReconstructX" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
@@ -762,16 +762,16 @@
<var name="varSsh" type="real" dimensions="nCells Time" streams="o" units="m"
description="variance of sea surface height"
/>
- <var name="avgNormalVelocityReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="avgNormalVelocityZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="time-averaged velocity in the eastward direction"
/>
- <var name="avgNormalVelocityReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="avgNormalVelocityMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="time-averaged velocity in the northward direction"
/>
- <var name="varNormalVelocityReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="varNormalVelocityZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="variance of velocity in the eastward direction"
/>
- <var name="varNormalVelocityReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="varNormalVelocityMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="variance of velocity in the northward direction"
/>
<var name="avgNormalVelocity" type="real" dimensions="nVertLevels nEdges Time" streams="o" units="m s^{-1}"
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_mpas_core.F 2013-04-15 15:34:56 UTC (rev 2749)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_mpas_core.F 2013-04-15 17:43:49 UTC (rev 2750)
@@ -283,11 +283,11 @@
call mpas_rbf_interp_initialize(mesh)
call mpas_init_reconstruct(mesh)
call mpas_reconstruct(mesh, block % state % time_levs(1) % state % normalVelocity % array, &
- block % state % time_levs(1) % state % normalVelocityReconstructX % array, &
- block % state % time_levs(1) % state % normalVelocityReconstructY % array, &
- block % state % time_levs(1) % state % normalVelocityReconstructZ % array, &
- block % state % time_levs(1) % state % normalVelocityReconstructZonal % array, &
- block % state % time_levs(1) % state % normalVelocityReconstructMeridional % array &
+ block % state % time_levs(1) % state % normalVelocityX % array, &
+ block % state % time_levs(1) % state % normalVelocityY % array, &
+ block % state % time_levs(1) % state % normalVelocityZ % array, &
+ block % state % time_levs(1) % state % normalVelocityZonal % array, &
+ block % state % time_levs(1) % state % normalVelocityMeridional % array &
)
call mpas_reconstruct(mesh, mesh % normalVelocityForcing % array, &
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_average.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_average.F 2013-04-15 15:34:56 UTC (rev 2749)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_average.F 2013-04-15 17:43:49 UTC (rev 2750)
@@ -14,17 +14,17 @@
real (kind=RKIND), pointer :: nAverage
real (kind=RKIND), dimension(:), pointer :: avgSSH, varSSH
- real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocityReconstructZonal, avgNormalVelocityReconstructMeridional, varNormalVelocityReconstructZonal, varNormalVelocityReconstructMeridional
+ real (kind=RKIND), dimension(:,:), pointer :: avgnormalVelocityZonal, avgnormalVelocityMeridional, varnormalVelocityZonal, varnormalVelocityMeridional
real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocity, varNormalVelocity, avgVertVelocityTop
nAverage => state % nAverage % scalar
avgSSH => state % avgSSH % array
varSSH => state % varSSH % array
- avgNormalVelocityReconstructZonal => state % avgNormalVelocityReconstructZonal % array
- avgNormalVelocityReconstructMeridional => state % avgNormalVelocityReconstructMeridional % array
- varNormalVelocityReconstructZonal => state % varNormalVelocityReconstructZonal % array
- varNormalVelocityReconstructMeridional => state % varNormalVelocityReconstructMeridional % array
+ avgnormalVelocityZonal => state % avgnormalVelocityZonal % array
+ avgnormalVelocityMeridional => state % avgnormalVelocityMeridional % array
+ varnormalVelocityZonal => state % varnormalVelocityZonal % array
+ varnormalVelocityMeridional => state % varnormalVelocityMeridional % array
avgNormalVelocity => state % avgNormalVelocity % array
varNormalVelocity => state % varNormalVelocity % array
avgVertVelocityTop => state % avgVertVelocityTop % array
@@ -33,10 +33,10 @@
avgSSH = 0.0
varSSH = 0.0
- avgNormalVelocityReconstructZonal = 0.0
- avgNormalVelocityReconstructMeridional = 0.0
- varNormalVelocityReconstructZonal = 0.0
- varNormalVelocityReconstructMeridional = 0.0
+ avgnormalVelocityZonal = 0.0
+ avgnormalVelocityMeridional = 0.0
+ varnormalVelocityZonal = 0.0
+ varnormalVelocityMeridional = 0.0
avgNormalVelocity = 0.0
varNormalVelocity = 0.0
avgVertVelocityTop = 0.0
@@ -50,51 +50,51 @@
real (kind=RKIND), pointer :: nAverage, old_nAverage
real (kind=RKIND), dimension(:), pointer :: ssh
- real (kind=RKIND), dimension(:,:), pointer :: normalVelocityReconstructZonal, normalVelocityReconstructMeridional, normalVelocity, vertVelocityTop
+ real (kind=RKIND), dimension(:,:), pointer :: normalVelocityZonal, normalVelocityMeridional, normalVelocity, vertVelocityTop
real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocity, varNormalVelocity, avgVertVelocityTop
- real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocityReconstructZonal, avgNormalVelocityReconstructMeridional, varNormalVelocityReconstructZonal, varNormalVelocityReconstructMeridional
+ real (kind=RKIND), dimension(:,:), pointer :: avgnormalVelocityZonal, avgnormalVelocityMeridional, varnormalVelocityZonal, varnormalVelocityMeridional
real (kind=RKIND), dimension(:), pointer :: avgSSH, varSSH
real (kind=RKIND), dimension(:,:), pointer :: old_avgNormalVelocity, old_varNormalVelocity, old_avgVertVelocityTop
- real (kind=RKIND), dimension(:,:), pointer :: old_avgNormalVelocityReconstructZonal, old_avgNormalVelocityReconstructMeridional, old_varNormalVelocityReconstructZonal, old_varNormalVelocityReconstructMeridional
+ real (kind=RKIND), dimension(:,:), pointer :: old_avgnormalVelocityZonal, old_avgnormalVelocityMeridional, old_varnormalVelocityZonal, old_varnormalVelocityMeridional
real (kind=RKIND), dimension(:), pointer :: old_avgSSH, old_varSSH
old_nAverage => old_state % nAverage % scalar
nAverage => state % nAverage % scalar
ssh => state % ssh % array
- normalVelocityReconstructZonal => state % normalVelocityReconstructZonal % array
- normalVelocityReconstructMeridional => state % normalVelocityReconstructMeridional % array
+ normalVelocityZonal => state % normalVelocityZonal % array
+ normalVelocityMeridional => state % normalVelocityMeridional % array
normalVelocity => state % normalVelocity % array
vertVelocityTop => state % vertVelocityTop % array
avgSSH => state % avgSSH % array
varSSH => state % varSSH % array
- avgNormalVelocityReconstructZonal => state % avgNormalVelocityReconstructZonal % array
- avgNormalVelocityReconstructMeridional => state % avgNormalVelocityReconstructMeridional % array
- varNormalVelocityReconstructZonal => state % varNormalVelocityReconstructZonal % array
- varNormalVelocityReconstructMeridional => state % varNormalVelocityReconstructMeridional % array
+ avgnormalVelocityZonal => state % avgnormalVelocityZonal % array
+ avgnormalVelocityMeridional => state % avgnormalVelocityMeridional % array
+ varnormalVelocityZonal => state % varnormalVelocityZonal % array
+ varnormalVelocityMeridional => state % varnormalVelocityMeridional % array
avgNormalVelocity => state % avgNormalVelocity % array
varNormalVelocity => state % varNormalVelocity % array
avgVertVelocityTop => state % avgVertVelocityTop % array
old_avgSSH => old_state % avgSSH % array
old_varSSH => old_state % varSSH % array
- old_avgNormalVelocityReconstructZonal => old_state % avgNormalVelocityReconstructZonal % array
- old_avgNormalVelocityReconstructMeridional => old_state % avgNormalVelocityReconstructMeridional % array
- old_varNormalVelocityReconstructZonal => old_state % varNormalVelocityReconstructZonal % array
- old_varNormalVelocityReconstructMeridional => old_state % varNormalVelocityReconstructMeridional % array
+ old_avgnormalVelocityZonal => old_state % avgnormalVelocityZonal % array
+ old_avgnormalVelocityMeridional => old_state % avgnormalVelocityMeridional % array
+ old_varnormalVelocityZonal => old_state % varnormalVelocityZonal % array
+ old_varnormalVelocityMeridional => old_state % varnormalVelocityMeridional % array
old_avgNormalVelocity => old_state % avgNormalVelocity % array
old_varNormalVelocity => old_state % varNormalVelocity % array
old_avgVertVelocityTop => old_state % avgVertVelocityTop % array
avgSSH = old_avgSSH + ssh
varSSH = old_varSSH + ssh**2
- avgNormalVelocityReconstructZonal = old_avgNormalVelocityReconstructZonal + normalVelocityReconstructZonal
- avgNormalVelocityReconstructMeridional = old_avgNormalVelocityReconstructMeridional + normalVelocityReconstructMeridional
- varNormalVelocityReconstructZonal = old_varNormalVelocityReconstructZonal + normalVelocityReconstructZonal**2
- varNormalVelocityReconstructMeridional = old_varNormalVelocityReconstructMeridional + normalVelocityReconstructMeridional**2
+ avgnormalVelocityZonal = old_avgnormalVelocityZonal + normalVelocityZonal
+ avgnormalVelocityMeridional = old_avgnormalVelocityMeridional + normalVelocityMeridional
+ varnormalVelocityZonal = old_varnormalVelocityZonal + normalVelocityZonal**2
+ varnormalVelocityMeridional = old_varnormalVelocityMeridional + normalVelocityMeridional**2
avgNormalVelocity = old_avgNormalVelocity + normalVelocity
varNormalVelocity = old_varNormalVelocity + normalVelocity**2
avgVertVelocityTop = old_avgVertVelocityTop + vertVelocityTop
@@ -108,17 +108,17 @@
real (kind=RKIND), pointer :: nAverage
real (kind=RKIND), dimension(:), pointer :: avgSSH, varSSH
- real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocityReconstructZonal, avgNormalVelocityReconstructMeridional, varNormalVelocityReconstructZonal, varNormalVelocityReconstructMeridional
+ real (kind=RKIND), dimension(:,:), pointer :: avgnormalVelocityZonal, avgnormalVelocityMeridional, varnormalVelocityZonal, varnormalVelocityMeridional
real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocity, varNormalVelocity, avgVertVelocityTop
nAverage => state % nAverage % scalar
avgSSH => state % avgSSH % array
varSSH => state % varSSH % array
- avgNormalVelocityReconstructZonal => state % avgNormalVelocityReconstructZonal % array
- avgNormalVelocityReconstructMeridional => state % avgNormalVelocityReconstructMeridional % array
- varNormalVelocityReconstructZonal => state % varNormalVelocityReconstructZonal % array
- varNormalVelocityReconstructMeridional => state % varNormalVelocityReconstructMeridional % array
+ avgnormalVelocityZonal => state % avgnormalVelocityZonal % array
+ avgnormalVelocityMeridional => state % avgnormalVelocityMeridional % array
+ varnormalVelocityZonal => state % varnormalVelocityZonal % array
+ varnormalVelocityMeridional => state % varnormalVelocityMeridional % array
avgNormalVelocity => state % avgNormalVelocity % array
varNormalVelocity => state % varNormalVelocity % array
avgVertVelocityTop => state % avgVertVelocityTop % array
@@ -126,10 +126,10 @@
if(nAverage > 0) then
avgSSH = avgSSH / nAverage
varSSH = varSSH / nAverage
- avgNormalVelocityReconstructZonal = avgNormalVelocityReconstructZonal / nAverage
- avgNormalVelocityReconstructMeridional = avgNormalVelocityReconstructMeridional / nAverage
- varNormalVelocityReconstructZonal = varNormalVelocityReconstructZonal / nAverage
- varNormalVelocityReconstructMeridional = varNormalVelocityReconstructMeridional / nAverage
+ avgnormalVelocityZonal = avgnormalVelocityZonal / nAverage
+ avgnormalVelocityMeridional = avgnormalVelocityMeridional / nAverage
+ varnormalVelocityZonal = varnormalVelocityZonal / nAverage
+ varnormalVelocityMeridional = varnormalVelocityMeridional / nAverage
avgNormalVelocity = avgNormalVelocity / nAverage
varNormalVelocity = varNormalVelocity / nAverage
avgVertVelocityTop = avgVertVelocityTop / nAverage
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F 2013-04-15 15:34:56 UTC (rev 2749)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F 2013-04-15 17:43:49 UTC (rev 2750)
@@ -307,11 +307,11 @@
+ block % state % time_levs(2) % state % uBolusGM % array(:,:)
call mpas_reconstruct(block % mesh, block % state % time_levs(2) % state % normalVelocity % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructX % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructY % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructZ % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructZonal % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructMeridional % array &
+ block % state % time_levs(2) % state % normalVelocityX % array, &
+ block % state % time_levs(2) % state % normalVelocityY % array, &
+ block % state % time_levs(2) % state % normalVelocityZ % array, &
+ block % state % time_levs(2) % state % normalVelocityZonal % array, &
+ block % state % time_levs(2) % state % normalVelocityMeridional % array &
)
call mpas_reconstruct(block % mesh, block % mesh % normalVelocityForcing % array, &
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F 2013-04-15 15:34:56 UTC (rev 2749)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F 2013-04-15 17:43:49 UTC (rev 2750)
@@ -90,7 +90,7 @@
n_bcl_iter(config_n_ts_iter), stage1_tend_time
type (block_type), pointer :: block
real (kind=RKIND) :: normalThicknessFluxSum, thicknessSum, flux, sshEdge, hEdge1, &
- CoriolisTerm, uCorr, temp, temp_h, coef, FBtr_coeff, sshCell1, sshCell2
+ CoriolisTerm, uCorr, temp, temp_h, coef, barotropicThicknessFlux_coeff, sshCell1, sshCell2
integer :: num_tracers, ucorr_coef, err
real (kind=RKIND), dimension(:,:), pointer :: &
u, h, layerThicknessEdge, kineticEnergyEdge, vertViscTopOfEdge, vertDiffTopOfCell
@@ -119,7 +119,7 @@
! timestep because the implicit vertical mixing is conducted on the
! total u. We keep normalBarotropicVelocity from the previous timestep.
! Note that normalBaroclinicVelocity may now include a barotropic component, because the
- ! weights layerThickness have changed. That is OK, because the GBtrForcing variable
+ ! weights layerThickness have changed. That is OK, because the barotropicForcing variable
! subtracts out the barotropic component from the baroclinic.
block % state % time_levs(1) % state % normalBaroclinicVelocity % array(k,iEdge) &
= block % state % time_levs(1) % state % normalVelocity % array(k,iEdge) &
@@ -246,7 +246,7 @@
normalThicknessFluxSum = normalThicknessFluxSum + block % state % time_levs(2) % state % layerThicknessEdge % array(k,iEdge) * uTemp(k)
thicknessSum = thicknessSum + block % state % time_levs(2) % state % layerThicknessEdge % array(k,iEdge)
enddo
- block % state % time_levs(1) % state % GBtrForcing % array(iEdge) = split*normalThicknessFluxSum/thicknessSum/dt
+ block % state % time_levs(1) % state % barotropicForcing % array(iEdge) = split*normalThicknessFluxSum/thicknessSum/dt
do k=1,block % mesh % maxLevelEdgeTop % array(iEdge)
@@ -257,7 +257,7 @@
block % state % time_levs(2) % state % normalBaroclinicVelocity % array(k,iEdge) &
= 0.5*( &
block % state % time_levs(1) % state % normalBaroclinicVelocity % array(k,iEdge) &
- + uTemp(k) - dt * block % state % time_levs(1) % state % GBtrForcing % array(iEdge))
+ + uTemp(k) - dt * block % state % time_levs(1) % state % barotropicForcing % array(iEdge))
enddo
@@ -325,7 +325,7 @@
do while (associated(block))
if (config_filter_btr_mode) then
- block % state % time_levs(1) % state % GBtrForcing % array(:) = 0.0
+ block % state % time_levs(1) % state % barotropicForcing % array(:) = 0.0
endif
do iCell=1,block % mesh % nCells
@@ -344,8 +344,8 @@
block % state % time_levs(2) % state % normalBarotropicVelocity % array(iEdge) &
= block % state % time_levs(1) % state % normalBarotropicVelocity % array(iEdge)
- ! FBtr = 0
- block % state % time_levs(1) % state % FBtr % array(iEdge) = 0.0
+ ! barotropicThicknessFlux = 0
+ block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) = 0.0
end do
block => block % next
@@ -387,7 +387,7 @@
* (block % state % time_levs(oldBtrSubcycleTime) % state % sshSubcycle % array(cell2) &
- block % state % time_levs(oldBtrSubcycleTime) % state % sshSubcycle % array(cell1) ) &
/ block % mesh % dcEdge % array(iEdge) &
- + block % state % time_levs(1) % state % GBtrForcing % array(iEdge))) * block % mesh % edgeMask % array(1, iEdge)
+ + block % state % time_levs(1) % state % barotropicForcing % array(iEdge))) * block % mesh % edgeMask % array(1, iEdge)
end do
block => block % next
@@ -408,12 +408,12 @@
block % tend % ssh % array(:) = 0.0
if (config_btr_solve_SSH2) then
- ! If config_btr_solve_SSH2=.true., then do NOT accumulate FBtr in this SSH predictor
+ ! If config_btr_solve_SSH2=.true., then do NOT accumulate barotropicThicknessFlux in this SSH predictor
! section, because it will be accumulated in the SSH corrector section.
- FBtr_coeff = 0.0
+ barotropicThicknessFlux_coeff = 0.0
else
- ! otherwise, DO accumulate FBtr in this SSH predictor section
- FBtr_coeff = 1.0
+ ! otherwise, DO accumulate barotropicThicknessFlux in this SSH predictor section
+ barotropicThicknessFlux_coeff = 1.0
endif
! config_btr_gam1_velWt1 sets the forward weighting of velocity in the SSH computation
@@ -477,8 +477,8 @@
+ config_btr_gam1_velWt1 * block % state % time_levs(newBtrSubcycleTime) % state % normalBarotropicVelocitySubcycle % array(iEdge)) &
* thicknessSum
- block % state % time_levs(1) % state % FBtr % array(iEdge) = block % state % time_levs(1) % state % FBtr % array(iEdge) &
- + FBtr_coeff*flux
+ block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) = block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) &
+ + barotropicThicknessFlux_coeff*flux
end do
! SSHnew = SSHold + dt/J*(-div(Flux))
@@ -533,7 +533,7 @@
block % state % time_levs(newBtrSubcycleTime) % state % normalBarotropicVelocitySubcycle % array(iEdge) &
= (block % state % time_levs(oldBtrSubcycleTime) % state % normalBarotropicVelocitySubcycle % array(iEdge) &
+ dt/config_n_btr_subcycles *(CoriolisTerm - gravity *(sshCell2 - sshCell1) /block % mesh % dcEdge % array(iEdge) &
- + block % state % time_levs(1) % state % GBtrForcing % array(iEdge))) * block % mesh % edgeMask % array(1,iEdge)
+ + block % state % time_levs(1) % state % barotropicForcing % array(iEdge))) * block % mesh % edgeMask % array(1,iEdge)
end do
deallocate(uTemp)
@@ -625,7 +625,7 @@
+ config_btr_gam3_velWt2 * block % state % time_levs(newBtrSubcycleTime) % state % normalBarotropicVelocitySubcycle % array(iEdge)) &
* thicknessSum
- block % state % time_levs(1) % state % FBtr % array(iEdge) = block % state % time_levs(1) % state % FBtr % array(iEdge) + flux
+ block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) = block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) + flux
end do
! SSHnew = SSHold + dt/J*(-div(Flux))
@@ -679,7 +679,7 @@
do while (associated(block))
do iEdge=1,block % mesh % nEdges
- block % state % time_levs(1) % state % FBtr % array(iEdge) = block % state % time_levs(1) % state % FBtr % array(iEdge) &
+ block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) = block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) &
/ (config_n_btr_subcycles*config_btr_subcycle_loop_factor)
block % state % time_levs(2) % state % normalBarotropicVelocity % array(iEdge) = block % state % time_levs(2) % state % normalBarotropicVelocity % array(iEdge) &
@@ -692,7 +692,7 @@
! boundary update on F
call mpas_timer_start("se halo F", .false., timer_halo_f)
- call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % FBtr)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % barotropicThicknessFlux)
call mpas_timer_stop("se halo F", timer_halo_f)
@@ -736,7 +736,7 @@
thicknessSum = thicknessSum + block % state % time_levs(2) % state % layerThicknessEdge % array(k,iEdge)
enddo
- uCorr = ucorr_coef*(( block % state % time_levs(1) % state % FBtr % array(iEdge) - normalThicknessFluxSum)/thicknessSum)
+ uCorr = ucorr_coef*(( block % state % time_levs(1) % state % barotropicThicknessFlux % array(iEdge) - normalThicknessFluxSum)/thicknessSum)
do k=1,block % mesh % nVertLevels
@@ -970,11 +970,11 @@
+ block % state % time_levs(2) % state % uBolusGM % array(:,:)
call mpas_reconstruct(block % mesh, block % state % time_levs(2) % state % normalVelocity % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructX % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructY % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructZ % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructZonal % array, &
- block % state % time_levs(2) % state % normalVelocityReconstructMeridional % array &
+ block % state % time_levs(2) % state % normalVelocityX % array, &
+ block % state % time_levs(2) % state % normalVelocityY % array, &
+ block % state % time_levs(2) % state % normalVelocityZ % array, &
+ block % state % time_levs(2) % state % normalVelocityZonal % array, &
+ block % state % time_levs(2) % state % normalVelocityMeridional % array &
)
call mpas_reconstruct(block % mesh, block % mesh % normalVelocityForcing % array, &
</font>
</pre>