Diagn for nonpenSW; corrected SW heating diag.

Diagnostics added for nonpenSW; Corrections made to SW heating diagnostic.
mom-ocean · Oct 2, 2015 · 3bee120 · 3bee120
1 parent b7715e3
commit 3bee120
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 1 deletion.
diff --git a/ice_ocean_SIS/GOLD_SIS/available_diags.000000 b/ice_ocean_SIS/GOLD_SIS/available_diags.000000
@@ -910,6 +910,10 @@
     ! long_name: Downwelling Shortwave Flux in Sea Water
     ! units: Watt meter-2
     ! standard_name: downwelling_shortwave_flux_in_sea_water
+"ocean_model", "nonpenSW"  [Unused]
+    ! long_name: Non-downwelling SW radiation (i.e., SW absorbed in ocean surface with LW,SENS,LAT)
+    ! units: Watt meter-2
+    ! standard_name: nondownwelling_shortwave_flux_in_sea_water
 "ocean_model", "h_ML"  [Unused]
     ! long_name: Surface mixed layer depth
     ! units: meter

diff --git a/ocean_only/global/available_diags.000000 b/ocean_only/global/available_diags.000000
@@ -964,6 +964,10 @@
     ! long_name: Downwelling Shortwave Flux in Sea Water
     ! units: Watt meter-2
     ! standard_name: downwelling_shortwave_flux_in_sea_water
+"ocean_model", "nonpenSW"  [Unused]
+    ! long_name: Non-downwelling SW radiation (i.e., SW absorbed in ocean surface with LW,SENS,LAT)
+    ! units: Watt meter-2
+    ! standard_name: nondownwelling_shortwave_flux_in_sea_water
 "ocean_model", "h_ML"  [Unused]
     ! long_name: Surface mixed layer depth
     ! units: meter

diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000
@@ -964,6 +964,10 @@
     ! long_name: Downwelling Shortwave Flux in Sea Water
     ! units: Watt meter-2
     ! standard_name: downwelling_shortwave_flux_in_sea_water
+"ocean_model", "nonpenSW"  [Unused]
+    ! long_name: Non-downwelling SW radiation (i.e., SW absorbed in ocean surface with LW,SENS,LAT)
+    ! units: Watt meter-2
+    ! standard_name: nondownwelling_shortwave_flux_in_sea_water
 "ocean_model", "h_ML"  [Unused]
     ! long_name: Surface mixed layer depth
     ! units: meter

diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000
@@ -928,6 +928,10 @@
     ! long_name: Downwelling Shortwave Flux in Sea Water
     ! units: Watt meter-2
     ! standard_name: downwelling_shortwave_flux_in_sea_water
+"ocean_model", "nonpenSW"  [Unused]
+    ! long_name: Non-downwelling SW radiation (i.e., SW absorbed in ocean surface with LW,SENS,LAT)
+    ! units: Watt meter-2
+    ! standard_name: nondownwelling_shortwave_flux_in_sea_water
 "ocean_model", "ePBL_h_ML"  [Unused]
     ! long_name: Surface mixed layer depth
     ! units: meter

diff --git a/ocean_only/mixed_layer_restrat_2d/available_diags.000000 b/ocean_only/mixed_layer_restrat_2d/available_diags.000000
@@ -830,6 +830,10 @@
     ! long_name: Downwelling Shortwave Flux in Sea Water
     ! units: Watt meter-2
     ! standard_name: downwelling_shortwave_flux_in_sea_water
+"ocean_model", "nonpenSW"  [Unused]
+    ! long_name: Non-downwelling SW radiation (i.e., SW absorbed in ocean surface with LW,SENS,LAT)
+    ! units: Watt meter-2
+    ! standard_name: nondownwelling_shortwave_flux_in_sea_water
 "ocean_model", "deficit_ratio"  [Unused]
     ! long_name: Max face thickness deficit ratio
     ! units: Nondim

diff --git a/src/MOM6 b/src/MOM6
+76 −26		src/core/MOM_forcing_type.F90
+63 −28		src/parameterizations/vertical/MOM_diabatic_aux.F90