Changeset 7585

Timestamp:

2017-01-20T16:06:55+01:00 (7 years ago)

Author:

timgraham

Message:

Bug fix

Location:

branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• NEMO/OPA_SRC/DYN/dynldf.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -115 +115 @@
          <field id="tpt_dep"      long_name="T-point depth"                  standard_name="depth_below_geoid"   unit="m"   grid_ref="grid_T_3D" />
          <field id="e3tdef"       long_name="T-cell thickness deformation"                                       unit="%"   grid_ref="grid_T_3D" />
+      </field_group>
+
+      <field_group id="constant_fields" grid_ref="grid_T_2D" >
+         <field id="areacello" long_name="Ocean Grid-Cell Area" standard_name="cell_area" unit="m2" />
+         <field id="sftof" long_name="Sea Area Fraction", standard_name="sea_area_fraction" unit="%" />
+         <field id="deptho" long_name="Sea Floor Depth Below Geoid" standard_name="sea_floor_depth_below_geoid" unit="m" />
+         <field id="avtb" long_name="Ocean Vertical Tracer Diffusivity due to Background" standard_name="ocean_vertical_tracer_diffusivity_due_to_background" unit="m2 s-1" />
+         <field id="avmb" long_name="Ocean Vertical Momentum Diffusivity due to Background" standard_name="ocean_vertical_momentum_diffusivity_due_to_background" unit="m2 s-1" />
+         <field id="ahmt_blp" long_name="Ocean Momentum XY Biharmonic Diffusivity" standard_name="ocean_momentum_xy_biharmonic_diffusivity"  unit="m4 s-1" />
+         <field id="ahmt_lap" long_name="Ocean Momentum XY Laplacian Diffusivity" standard_name="ocean_momentum_xy_laplacian_diffusivity"  unit="m2 s-1" />
+         <field id="aht2D" long_name="ocean tracer epineutral laplacian diffusivity" standard_name="ocean_tracer_epineutral_laplacian_diffusivity"  unit="m2 s-1" />
+         <field id="hfgeou" long_name="Upward Geothermal Heat Flux at Sea Floor" standard_name="upward_geothermal_heat_flux_at_sea_floor" units="W m-2" />
       </field_group>
 

branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90

@@ -86 +86 @@
              DO jj=2,jpj
                 DO ji=2,jpi
-                   ztmp(ji,jj) = (ahm3(ji,jj)*umask(ji,jj) + ahm3(ji-1,jj)*umask(ji-1,jj) &
-                                + ahm4(ji,jj)*vmask(ji,jj) + ahm4(ji,jj-1)*vmask(ji,jj-1)) / &
-                      &  (umask(ji,jj) + umask(ji-1,jj) + vmask(ji,jj) + vmask(ji,jj-1))
+                   ztmp(ji,jj) = (ahm3(ji,jj)*umask(ji,jj,1) + ahm3(ji-1,jj)*umask(ji-1,jj,1) &
+                                + ahm4(ji,jj)*vmask(ji,jj,1) + ahm4(ji,jj-1)*vmask(ji,jj-1,1)) / &
+                      &  (umask(ji,jj,1) + umask(ji-1,jj,1) + vmask(ji,jj,1) + vmask(ji,jj-1,1))
                 ENDDO
              ENDDO