Changeset 7747 for branches

Timestamp:

2017-03-01T15:10:15+01:00 (7 years ago)

Author:

timgraham

Message:

GMED ticket 310. Modify diaptr to do integral from bottom to top of ocean

Location:

branches/UKMO/dev_r5518_GO6_package/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (3 diffs)

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

@@ -688 +688 @@
         <field id="zomsfind"          long_name="Meridional Stream-Function: Indian"           unit="Sv"       grid_ref="gznl_W_3D" />
         <field id="zomsfipc"          long_name="Meridional Stream-Function: Pacific+Indian"   unit="Sv"       grid_ref="gznl_W_3D" />
+        <field id="zomsfeivglo"       long_name="Meridional Stream-Function: Global"           unit="Sv"       grid_ref="gznl_W_3D" />
+        <field id="zomsfeivatl"       long_name="Meridional Stream-Function: Atlantic"         unit="Sv"       grid_ref="gznl_W_3D" />
+        <field id="zomsfeivpac"       long_name="Meridional Stream-Function: Pacific"          unit="Sv"       grid_ref="gznl_W_3D" />
+        <field id="zomsfeivind"       long_name="Meridional Stream-Function: Indian"           unit="Sv"       grid_ref="gznl_W_3D" />
+        <field id="zomsfeivipc"       long_name="Meridional Stream-Function: Pacific+Indian"   unit="Sv"       grid_ref="gznl_W_3D" />
         <field id="zotemglo"          long_name="Zonal Mean Temperature : Global"              unit="degree_C"     grid_ref="gznl_T_3D" />
         <field id="zotematl"          long_name="Zonal Mean Temperature : Atlantic"            unit="degree_C"     grid_ref="gznl_T_3D" />

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -102 +102 @@
 
       !
+      z3d(:,:,:) = 0._wp
       IF( PRESENT( pvtr ) ) THEN
          IF( iom_use("zomsfglo") ) THEN    ! effective MSF
             z3d(1,:,:) = ptr_sjk( pvtr(:,:,:) )  ! zonal cumulative effective transport
-            DO jk = 2, jpkm1 
-              z3d(1,:,jk) = z3d(1,:,jk-1) + z3d(1,:,jk)   ! effective j-Stream-Function (MSF)
+            DO jk = jpkm1,1,-1                   !Integrate from bottom up to get
+              z3d(1,:,jk) = z3d(1,:,jk+1) - z3d(1,:,jk)   ! effective j-Stream-Function (MSF)
             END DO
             DO ji = 1, jpi
@@ -114 +115 @@
             CALL iom_put( cl1, z3d * rc_sv )
             DO jn = 2, nptr                                    ! by sub-basins
-               z3d(1,:,:) =  ptr_sjk( pvtr(:,:,:), btmsk(:,:,jn)*btm30(:,:) ) 
-               DO jk = 2, jpkm1 
-                  z3d(1,:,jk) = z3d(1,:,jk-1) + z3d(1,:,jk)    ! effective j-Stream-Function (MSF)
+               z3d(1,:,:) =  ptr_sjk( pvtr(:,:,:), btmsk(:,:,jn) ) 
+               DO jk = jpkm1,1,-1
+                  z3d(1,:,jk) = z3d(1,:,jk+1) - z3d(1,:,jk)    ! effective j-Stream-Function (MSF)
                END DO
                DO ji = 1, jpi
@@ -406 +407 @@
                ENDIF
             ENDIF
+            IF( iom_use("zomsfeivglo") ) THEN
+               z3d(1,:,:) = ptr_sjk( v_eiv(:,:,:) )  ! zonal cumulative effective transport
+               DO jk = jpkm1,1,-1
+                 z3d(1,:,jk) = z3d(1,:,jk+1) - z3d(1,:,jk)   ! effective j-Stream-Function (MSF)
+               END DO
+               DO ji = 1, jpi
+                  z3d(ji,:,:) = z3d(1,:,:)
+               ENDDO
+               cl1 = TRIM('zomsfeiv'//clsubb(1) )
+               CALL iom_put( cl1, z3d * rc_sv )
+               IF( ln_subbas ) THEN
+                  DO jn = 2, nptr                                    ! by sub-basins
+                     z3d(1,:,:) =  ptr_sjk( v_eiv(:,:,:), btmsk(:,:,jn) ) 
+                     DO jk = jpkm1,1,-1
+                        z3d(1,:,jk) = z3d(1,:,jk+1) - z3d(1,:,jk)    ! effective j-Stream-Function (MSF)
+                     END DO
+                     DO ji = 1, jpi
+                        z3d(ji,:,:) = z3d(1,:,:)
+                     ENDDO
+                     cl1 = TRIM('zomsfeiv'//clsubb(jn) )
+                     CALL iom_put( cl1, z3d * rc_sv )
+                  END DO
+               ENDIF
+            ENDIF
          ENDIF
 #endif