<p><b>dwj07@fsu.edu</b> 2013-04-03 11:14:54 -0600 (Wed, 03 Apr 2013)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Renaming variables:<br>
acc_*Var -> var*<br>
acc_* -> avg*<br>
uReconstruct* -> normalVelocityReconstruct*<br>
uSrcReconstruct* -> normalVelocityForcingReconstruct*<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-03 17:03:40 UTC (rev 2717)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml 2013-04-03 17:14:54 UTC (rev 2718)
@@ -672,34 +672,34 @@
<var name="ke_edge" type="real" dimensions="nVertLevels nEdges Time" units="m^2 s^{-2}"
description="kinetic energy of horizonal velocity defined at edges"
/>
- <var name="uReconstructX" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
+ <var name="normalVelocityReconstructX" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
description="component of horizontal velocity in the x-direction (cartesian)"
/>
- <var name="uReconstructY" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
+ <var name="normalVelocityReconstructY" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
description="component of horizontal velocity in the y-direction (cartesian)"
/>
- <var name="uReconstructZ" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
+ <var name="normalVelocityReconstructZ" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
description="component of horizontal velocity in the z-direction (cartesian)"
/>
- <var name="uReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="normalVelocityReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="component of horizontal velocity in the eastward direction"
/>
- <var name="uReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="normalVelocityReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="component of horizontal velocity in the northward"
/>
- <var name="uSrcReconstructX" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
+ <var name="normalVelocityForcingReconstructX" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
description="wind stress in the x-direction (cartesian)"
/>
- <var name="uSrcReconstructY" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
+ <var name="normalVelocityForcingReconstructY" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
description="wind stress in the y-direction (cartesian)"
/>
- <var name="uSrcReconstructZ" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
+ <var name="normalVelocityForcingReconstructZ" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
description="wind stress in the z-direction (cartesian)"
/>
- <var name="uSrcReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="N m^{-2}"
+ <var name="normalVelocityForcingReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="N m^{-2}"
description="wind stress in the eastward direction"
/>
- <var name="uSrcReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="N m^{-2}"
+ <var name="normalVelocityForcingReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="N m^{-2}"
description="wind stress in the northward direction"
/>
<var name="MontPot" type="real" dimensions="nVertLevels nCells Time" units="m^2 s^{-2}"
@@ -753,34 +753,34 @@
<var name="CFLNumberGlobal" type="real" dimensions="Time" streams="o" units="unitless"
description="maximum CFL number over the full domain"
/>
- <var name="nAccumulate" type="real" dimensions="Time" streams="o" units="unitless"
+ <var name="nAverage" type="real" dimensions="Time" streams="o" units="unitless"
description="number of timesteps in time-averaged variables"
/>
- <var name="acc_ssh" type="real" dimensions="nCells Time" streams="o" units="m"
+ <var name="avgSsh" type="real" dimensions="nCells Time" streams="o" units="m"
description="time-averaged sea surface height"
/>
- <var name="acc_sshVar" type="real" dimensions="nCells Time" streams="o" units="m"
+ <var name="varSsh" type="real" dimensions="nCells Time" streams="o" units="m"
description="variance of sea surface height"
/>
- <var name="acc_uReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="avgNormalVelocityReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="time-averaged velocity in the eastward direction"
/>
- <var name="acc_uReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="avgNormalVelocityReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="time-averaged velocity in the northward direction"
/>
- <var name="acc_uReconstructZonalVar" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="varNormalVelocityReconstructZonal" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="variance of velocity in the eastward direction"
/>
- <var name="acc_uReconstructMeridionalVar" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
+ <var name="varNormalVelocityReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="m s^{-1}"
description="variance of velocity in the northward direction"
/>
- <var name="acc_u" type="real" dimensions="nVertLevels nEdges Time" streams="o" units="m s^{-1}"
+ <var name="avgNormalVelocity" type="real" dimensions="nVertLevels nEdges Time" streams="o" units="m s^{-1}"
description="time-averaged velocity, normal to cell edge"
/>
- <var name="acc_uVar" type="real" dimensions="nVertLevels nEdges Time" streams="o" units="m s^{-1}"
+ <var name="varNormalVelocity" type="real" dimensions="nVertLevels nEdges Time" streams="o" units="m s^{-1}"
description="variance of velocity, normal to cell edge"
/>
- <var name="acc_vertVelocityTop" type="real" dimensions="nVertLevelsP1 nCells Time" streams="o" units="m s^{-1}"
+ <var name="avgVertVelocityTop" type="real" dimensions="nVertLevelsP1 nCells Time" streams="o" units="m s^{-1}"
description="time-averaged vertical velocity at top of cell"
/>
</var_struct>
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-03 17:03:40 UTC (rev 2717)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_mpas_core.F 2013-04-03 17:14:54 UTC (rev 2718)
@@ -283,19 +283,19 @@
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 % uReconstructX % array, &
- block % state % time_levs(1) % state % uReconstructY % array, &
- block % state % time_levs(1) % state % uReconstructZ % array, &
- block % state % time_levs(1) % state % uReconstructZonal % array, &
- block % state % time_levs(1) % state % uReconstructMeridional % 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 &
)
call mpas_reconstruct(mesh, mesh % normalVelocityForcing % array, &
- block % state % time_levs(1) % state % uSrcReconstructX % array, &
- block % state % time_levs(1) % state % uSrcReconstructY % array, &
- block % state % time_levs(1) % state % uSrcReconstructZ % array, &
- block % state % time_levs(1) % state % uSrcReconstructZonal % array, &
- block % state % time_levs(1) % state % uSrcReconstructMeridional % array &
+ block % state % time_levs(1) % state % normalVelocityForcingReconstructX % array, &
+ block % state % time_levs(1) % state % normalVelocityForcingReconstructY % array, &
+ block % state % time_levs(1) % state % normalVelocityForcingReconstructZ % array, &
+ block % state % time_levs(1) % state % normalVelocityForcingReconstructZonal % array, &
+ block % state % time_levs(1) % state % normalVelocityForcingReconstructMeridional % array &
)
! initialize velocities and tracers on land to be zero.
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-03 17:03:40 UTC (rev 2717)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_average.F 2013-04-03 17:14:54 UTC (rev 2718)
@@ -11,35 +11,35 @@
subroutine ocn_time_average_init(state)!{{{
type (state_type), intent(inout) :: state
- real (kind=RKIND), pointer :: nAccumulate
+ real (kind=RKIND), pointer :: nAverage
- real (kind=RKIND), dimension(:), pointer :: acc_ssh, acc_sshVar
- real (kind=RKIND), dimension(:,:), pointer :: acc_uReconstructZonal, acc_uReconstructMeridional, acc_uReconstructZonalVar, acc_uReconstructMeridionalVar
- real (kind=RKIND), dimension(:,:), pointer :: acc_u, acc_uVar, acc_vertVelocityTop
+ real (kind=RKIND), dimension(:), pointer :: avgSSH, varSSH
+ real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocityReconstructZonal, avgNormalVelocityReconstructMeridional, varNormalVelocityReconstructZonal, varNormalVelocityReconstructMeridional
+ real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocity, varNormalVelocity, avgVertVelocityTop
- nAccumulate => state % nAccumulate % scalar
+ nAverage => state % nAverage % scalar
- acc_ssh => state % acc_ssh % array
- acc_sshVar => state % acc_sshVar % array
- acc_uReconstructZonal => state % acc_uReconstructZonal % array
- acc_uReconstructMeridional => state % acc_uReconstructMeridional % array
- acc_uReconstructZonalVar => state % acc_uReconstructZonalVar % array
- acc_uReconstructMeridionalVar => state % acc_uReconstructMeridionalVar % array
- acc_u => state % acc_u % array
- acc_uVar => state % acc_uVar % array
- acc_vertVelocityTop => state % acc_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
+ avgNormalVelocity => state % avgNormalVelocity % array
+ varNormalVelocity => state % varNormalVelocity % array
+ avgVertVelocityTop => state % avgVertVelocityTop % array
- nAccumulate = 0
+ nAverage = 0
- acc_ssh = 0.0
- acc_sshVar = 0.0
- acc_uReconstructZonal = 0.0
- acc_uReconstructMeridional = 0.0
- acc_uReconstructZonalVar = 0.0
- acc_uReconstructMeridionalVar = 0.0
- acc_u = 0.0
- acc_uVar = 0.0
- acc_vertVelocityTop = 0.0
+ avgSSH = 0.0
+ varSSH = 0.0
+ avgNormalVelocityReconstructZonal = 0.0
+ avgNormalVelocityReconstructMeridional = 0.0
+ varNormalVelocityReconstructZonal = 0.0
+ varNormalVelocityReconstructMeridional = 0.0
+ avgNormalVelocity = 0.0
+ varNormalVelocity = 0.0
+ avgVertVelocityTop = 0.0
end subroutine ocn_time_average_init!}}}
@@ -47,92 +47,92 @@
type (state_type), intent(inout) :: state
type (state_type), intent(in) :: old_state
- real (kind=RKIND), pointer :: nAccumulate, old_nAccumulate
+ real (kind=RKIND), pointer :: nAverage, old_nAverage
real (kind=RKIND), dimension(:), pointer :: ssh
- real (kind=RKIND), dimension(:,:), pointer :: uReconstructZonal, uReconstructMeridional, normalVelocity, vertVelocityTop
+ real (kind=RKIND), dimension(:,:), pointer :: normalVelocityReconstructZonal, normalVelocityReconstructMeridional, normalVelocity, vertVelocityTop
- real (kind=RKIND), dimension(:,:), pointer :: acc_u, acc_uVar, acc_vertVelocityTop
- real (kind=RKIND), dimension(:,:), pointer :: acc_uReconstructZonal, acc_uReconstructMeridional, acc_uReconstructZonalVar, acc_uReconstructMeridionalVar
- real (kind=RKIND), dimension(:), pointer :: acc_ssh, acc_sshVar
+ real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocity, varNormalVelocity, avgVertVelocityTop
+ real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocityReconstructZonal, avgNormalVelocityReconstructMeridional, varNormalVelocityReconstructZonal, varNormalVelocityReconstructMeridional
+ real (kind=RKIND), dimension(:), pointer :: avgSSH, varSSH
- real (kind=RKIND), dimension(:,:), pointer :: old_acc_u, old_acc_uVar, old_acc_vertVelocityTop
- real (kind=RKIND), dimension(:,:), pointer :: old_acc_uReconstructZonal, old_acc_uReconstructMeridional, old_acc_uReconstructZonalVar, old_acc_uReconstructMeridionalVar
- real (kind=RKIND), dimension(:), pointer :: old_acc_ssh, old_acc_sshVar
+ 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_avgSSH, old_varSSH
- old_nAccumulate => old_state % nAccumulate % scalar
- nAccumulate => state % nAccumulate % scalar
+ old_nAverage => old_state % nAverage % scalar
+ nAverage => state % nAverage % scalar
ssh => state % ssh % array
- uReconstructZonal => state % uReconstructZonal % array
- uReconstructMeridional => state % uReconstructMeridional % array
+ normalVelocityReconstructZonal => state % normalVelocityReconstructZonal % array
+ normalVelocityReconstructMeridional => state % normalVelocityReconstructMeridional % array
normalVelocity => state % normalVelocity % array
vertVelocityTop => state % vertVelocityTop % array
- acc_ssh => state % acc_ssh % array
- acc_sshVar => state % acc_sshVar % array
- acc_uReconstructZonal => state % acc_uReconstructZonal % array
- acc_uReconstructMeridional => state % acc_uReconstructMeridional % array
- acc_uReconstructZonalVar => state % acc_uReconstructZonalVar % array
- acc_uReconstructMeridionalVar => state % acc_uReconstructMeridionalVar % array
- acc_u => state % acc_u % array
- acc_uVar => state % acc_uVar % array
- acc_vertVelocityTop => state % acc_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
+ avgNormalVelocity => state % avgNormalVelocity % array
+ varNormalVelocity => state % varNormalVelocity % array
+ avgVertVelocityTop => state % avgVertVelocityTop % array
- old_acc_ssh => old_state % acc_ssh % array
- old_acc_sshVar => old_state % acc_sshVar % array
- old_acc_uReconstructZonal => old_state % acc_uReconstructZonal % array
- old_acc_uReconstructMeridional => old_state % acc_uReconstructMeridional % array
- old_acc_uReconstructZonalVar => old_state % acc_uReconstructZonalVar % array
- old_acc_uReconstructMeridionalVar => old_state % acc_uReconstructMeridionalVar % array
- old_acc_u => old_state % acc_u % array
- old_acc_uVar => old_state % acc_uVar % array
- old_acc_vertVelocityTop => old_state % acc_vertVelocityTop % 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_avgNormalVelocity => old_state % avgNormalVelocity % array
+ old_varNormalVelocity => old_state % varNormalVelocity % array
+ old_avgVertVelocityTop => old_state % avgVertVelocityTop % array
- acc_ssh = old_acc_ssh + ssh
- acc_sshVar = old_acc_sshVar + ssh**2
- acc_uReconstructZonal = old_acc_uReconstructZonal + uReconstructZonal
- acc_uReconstructMeridional = old_acc_uReconstructMeridional + uReconstructMeridional
- acc_uReconstructZonalVar = old_acc_uReconstructZonalVar + uReconstructZonal**2
- acc_uReconstructMeridionalVar = old_acc_uReconstructMeridionalVar + uReconstructMeridional**2
- acc_u = old_acc_u + normalVelocity
- acc_uVar = old_acc_uVar + normalVelocity**2
- acc_vertVelocityTop = old_acc_vertVelocityTop + vertVelocityTop
+ 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
+ avgNormalVelocity = old_avgNormalVelocity + normalVelocity
+ varNormalVelocity = old_varNormalVelocity + normalVelocity**2
+ avgVertVelocityTop = old_avgVertVelocityTop + vertVelocityTop
- nAccumulate = old_nAccumulate + 1
+ nAverage = old_nAverage + 1
end subroutine ocn_time_average_accumulate!}}}
subroutine ocn_time_average_normalize(state)!{{{
type (state_type), intent(inout) :: state
- real (kind=RKIND), pointer :: nAccumulate
+ real (kind=RKIND), pointer :: nAverage
- real (kind=RKIND), dimension(:), pointer :: acc_ssh, acc_sshVar
- real (kind=RKIND), dimension(:,:), pointer :: acc_uReconstructZonal, acc_uReconstructMeridional, acc_uReconstructZonalVar, acc_uReconstructMeridionalVar
- real (kind=RKIND), dimension(:,:), pointer :: acc_u, acc_uVar, acc_vertVelocityTop
+ real (kind=RKIND), dimension(:), pointer :: avgSSH, varSSH
+ real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocityReconstructZonal, avgNormalVelocityReconstructMeridional, varNormalVelocityReconstructZonal, varNormalVelocityReconstructMeridional
+ real (kind=RKIND), dimension(:,:), pointer :: avgNormalVelocity, varNormalVelocity, avgVertVelocityTop
- nAccumulate => state % nAccumulate % scalar
+ nAverage => state % nAverage % scalar
- acc_ssh => state % acc_ssh % array
- acc_sshVar => state % acc_sshVar % array
- acc_uReconstructZonal => state % acc_uReconstructZonal % array
- acc_uReconstructMeridional => state % acc_uReconstructMeridional % array
- acc_uReconstructZonalVar => state % acc_uReconstructZonalVar % array
- acc_uReconstructMeridionalVar => state % acc_uReconstructMeridionalVar % array
- acc_u => state % acc_u % array
- acc_uVar => state % acc_uVar % array
- acc_vertVelocityTop => state % acc_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
+ avgNormalVelocity => state % avgNormalVelocity % array
+ varNormalVelocity => state % varNormalVelocity % array
+ avgVertVelocityTop => state % avgVertVelocityTop % array
- if(nAccumulate > 0) then
- acc_ssh = acc_ssh / nAccumulate
- acc_sshVar = acc_sshVar / nAccumulate
- acc_uReconstructZonal = acc_uReconstructZonal / nAccumulate
- acc_uReconstructMeridional = acc_uReconstructMeridional / nAccumulate
- acc_uReconstructZonalVar = acc_uReconstructZonalVar / nAccumulate
- acc_uReconstructMeridionalVar = acc_uReconstructMeridionalVar / nAccumulate
- acc_u = acc_u / nAccumulate
- acc_uVar = acc_uVar / nAccumulate
- acc_vertVelocityTop = acc_vertVelocityTop / nAccumulate
+ if(nAverage > 0) then
+ avgSSH = avgSSH / nAverage
+ varSSH = varSSH / nAverage
+ avgNormalVelocityReconstructZonal = avgNormalVelocityReconstructZonal / nAverage
+ avgNormalVelocityReconstructMeridional = avgNormalVelocityReconstructMeridional / nAverage
+ varNormalVelocityReconstructZonal = varNormalVelocityReconstructZonal / nAverage
+ varNormalVelocityReconstructMeridional = varNormalVelocityReconstructMeridional / nAverage
+ avgNormalVelocity = avgNormalVelocity / nAverage
+ varNormalVelocity = varNormalVelocity / nAverage
+ avgVertVelocityTop = avgVertVelocityTop / nAverage
end if
end subroutine ocn_time_average_normalize!}}}
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-03 17:03:40 UTC (rev 2717)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F 2013-04-03 17:14:54 UTC (rev 2718)
@@ -307,19 +307,19 @@
+ 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 % uReconstructX % array, &
- block % state % time_levs(2) % state % uReconstructY % array, &
- block % state % time_levs(2) % state % uReconstructZ % array, &
- block % state % time_levs(2) % state % uReconstructZonal % array, &
- block % state % time_levs(2) % state % uReconstructMeridional % 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 &
)
call mpas_reconstruct(block % mesh, block % mesh % normalVelocityForcing % array, &
- block % state % time_levs(2) % state % uSrcReconstructX % array, &
- block % state % time_levs(2) % state % uSrcReconstructY % array, &
- block % state % time_levs(2) % state % uSrcReconstructZ % array, &
- block % state % time_levs(2) % state % uSrcReconstructZonal % array, &
- block % state % time_levs(2) % state % uSrcReconstructMeridional % array &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructX % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructY % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructZ % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructZonal % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructMeridional % array &
)
call ocn_time_average_accumulate(block % state % time_levs(2) % state, block % state % time_levs(1) % state)
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-03 17:03:40 UTC (rev 2717)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F 2013-04-03 17:14:54 UTC (rev 2718)
@@ -970,19 +970,19 @@
+ 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 % uReconstructX % array, &
- block % state % time_levs(2) % state % uReconstructY % array, &
- block % state % time_levs(2) % state % uReconstructZ % array, &
- block % state % time_levs(2) % state % uReconstructZonal % array, &
- block % state % time_levs(2) % state % uReconstructMeridional % 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 &
)
call mpas_reconstruct(block % mesh, block % mesh % normalVelocityForcing % array, &
- block % state % time_levs(2) % state % uSrcReconstructX % array, &
- block % state % time_levs(2) % state % uSrcReconstructY % array, &
- block % state % time_levs(2) % state % uSrcReconstructZ % array, &
- block % state % time_levs(2) % state % uSrcReconstructZonal % array, &
- block % state % time_levs(2) % state % uSrcReconstructMeridional % array &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructX % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructY % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructZ % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructZonal % array, &
+ block % state % time_levs(2) % state % normalVelocityForcingReconstructMeridional % array &
)
call ocn_time_average_accumulate(block % state % time_levs(2) % state, block % state % time_levs(1) % state)
</font>
</pre>