added zonal and meridional bolus velocities to monthly output; added …

…bolus velocity * temperature to eddy stats
E3SM-Project · Aug 14, 2019 · c95f8f8 · c95f8f8
1 parent d41852e
commit c95f8f8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/analysis_members/Registry_eddy_product_variables.xml b/analysis_members/Registry_eddy_product_variables.xml
@@ -39,6 +39,12 @@
 		<var name="velocityMeridionalTimesTemperature" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1} C"
 			description="cell-wise product of component of horizontal velocity in the northward direction and temperature"
 		/>
+                <var name="velocityZonalTimesTemperature_GM" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1} C"
+                        description="cell-wise product of component of horizontal bolus velocity in the eastward direction and temperature"
+                />
+                <var name="velocityMeridionalTimesTemperature_GM" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1} C"
+                        description="cell-wise product of component of horizontal bolus velocity in the northward direction and temperature"
+                />
 	</var_struct>
 	<streams>
 		<stream name="eddyProductVariablesOutput" type="output"
@@ -56,5 +62,7 @@
 			<var name="velocityMeridionalSquared"/>
 			<var name="velocityZonalTimesTemperature"/>
 			<var name="velocityMeridionalTimesTemperature"/>
+                        <var name="velocityZonalTimesTemperature_GM"/>
+                        <var name="velocityMeridionalTimesTemperature_GM"/>
 		</stream>
 	</streams>
diff --git a/analysis_members/Registry_time_series_stats_monthly_mean.xml b/analysis_members/Registry_time_series_stats_monthly_mean.xml
@@ -195,5 +195,9 @@
 			<var name="velocityMeridionalSquared"/>
 			<var name="velocityZonalTimesTemperature"/>
 			<var name="velocityMeridionalTimesTemperature"/>
+                        <var name="velocityZonalTimesTemperature_GM"/>
+                        <var name="velocityMeridionalTimesTemperature_GM"/>
+                        <var name="GMBolusVelocityZonal"/>
+                        <var name="GMBolusVelocityMeridional"/>
 		</stream>
 	</streams>
diff --git a/analysis_members/mpas_ocn_eddy_product_variables.F b/analysis_members/mpas_ocn_eddy_product_variables.F
@@ -183,8 +183,9 @@ subroutine ocn_compute_eddy_product_variables(domain, timeLevel, err)!{{{
       integer, dimension(:), pointer :: maxLevelCell
 
       real (kind=RKIND), dimension(:), pointer :: ssh, SSHSquared
-      real (kind=RKIND), dimension(:,:), pointer :: velocityZonal, velocityMeridional, &
-           velocityZonalSquared, velocityMeridionalSquared, velocityZonalTimesTemperature, velocityMeridionalTimesTemperature
+      real (kind=RKIND), dimension(:,:), pointer :: velocityZonal, velocityMeridional, GMBolusVelocityZonal, GMBolusVelocityMeridional, &
+           velocityZonalSquared, velocityMeridionalSquared, velocityZonalTimesTemperature, velocityMeridionalTimesTemperature, &
+           velocityZonalTimesTemperature_GM, velocityMeridionalTimesTemperature_GM
       real (kind=RKIND), dimension(:,:,:), pointer :: activeTracers
 
       err = 0
@@ -208,14 +209,18 @@ subroutine ocn_compute_eddy_product_variables(domain, timeLevel, err)!{{{
          call mpas_pool_get_array(statePool, 'ssh',ssh, 1)
          call mpas_pool_get_array(diagnosticsPool, 'velocityZonal', velocityZonal)
          call mpas_pool_get_array(diagnosticsPool, 'velocityMeridional', velocityMeridional)
-
+         call mpas_pool_get_array(diagnosticsPool, 'GMBolusVelocityZonal',GMBolusVelocityZonal)
+         call mpas_pool_get_array(diagnosticsPool, 'GMBolusVelocityMeridional', GMBolusVelocityMeridional)
          call mpas_pool_get_array(meshPool, 'maxLevelCell', maxLevelCell)
          call mpas_pool_get_array(eddyProductVariablesAMPool, 'SSHSquared', SSHSquared)
          call mpas_pool_get_array(eddyProductVariablesAMPool, 'velocityZonalSquared', velocityZonalSquared)
          call mpas_pool_get_array(eddyProductVariablesAMPool, 'velocityMeridionalSquared', velocityMeridionalSquared)
          call mpas_pool_get_array(eddyProductVariablesAMPool, 'velocityZonalTimesTemperature', velocityZonalTimesTemperature)
          call mpas_pool_get_array(eddyProductVariablesAMPool, 'velocityMeridionalTimesTemperature', &
             velocityMeridionalTimesTemperature)
+         call mpas_pool_get_array(eddyProductVariablesAMPool,'velocityZonalTimesTemperature_GM', velocityZonalTimesTemperature_GM)
+         call mpas_pool_get_array(eddyProductVariablesAMPool,'velocityMeridionalTimesTemperature_GM', &
+            velocityMeridionalTimesTemperature_GM)
 
          do iCell = 1,nCellsSolve
             SSHSquared(iCell) = ssh(iCell)**2
@@ -224,7 +229,9 @@ subroutine ocn_compute_eddy_product_variables(domain, timeLevel, err)!{{{
                velocityMeridionalSquared(k,iCell) = velocityMeridional(k,iCell)**2
                velocityZonalTimesTemperature(k,iCell) = velocityZonal(k,iCell)*activeTracers(index_temperature,k,iCell)
                velocityMeridionalTimesTemperature(k,iCell) = velocityMeridional(k,iCell)*activeTracers(index_temperature,k,iCell)
-            end do
+               velocityZonalTimesTemperature_GM(k,iCell) = GMBolusVelocityZonal(k,iCell)*activeTracers(index_temperature,k,iCell)
+               velocityMeridionalTimesTemperature_GM(k,iCell) = GMBolusVelocityMeridional(k,iCell)*activeTracers(index_temperature,k,iCell)
+             end do
          end do
 
          block => block % next