Changeset 5098 for branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

Timestamp:

2015-02-20T20:11:47+01:00 (9 years ago)

Author:

mathiot

Message:

add wmask, wumask, wvmask and restore loop order and add flag to ignore specific isf code if no isf

File:

• branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) (2 diffs)

branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -145 +145 @@
          z3d(:,:,:) = tsn(:,:,:,jp_tem) * fse3t_n(:,:,:)
          CALL iom_put( "toce" , z3d                        )   ! heat content
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               z2d(ji,jj) = tsn(ji,jj,mikt(ji,jj),jp_tem) * fse3t_n(ji,jj,mikt(ji,jj))
-            END DO
-         END DO  
-         CALL iom_put( "sst"  , z2d(:,:)                 )   ! sea surface heat content      
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               z2d(ji,jj) = tsn(ji,jj,mikt(ji,jj),jp_tem)**2 * fse3t_n(ji,jj,mikt(ji,jj))
-            END DO
-         END DO  
-         CALL iom_put( "sst2" , z2d(:,:)      )   ! sea surface content of squared temperature
+         CALL iom_put( "sst"  , z3d(:,:,1)                 )   ! sea surface heat content
+         z3d(:,:,1) = tsn(:,:,1,jp_tem) * z3d(:,:,1)
+         CALL iom_put( "sst2" , z3d(:,:,1)                 )   ! sea surface content of squared temperature
          z3d(:,:,:) = tsn(:,:,:,jp_sal) * fse3t_n(:,:,:)            
          CALL iom_put( "soce" , z3d                        )   ! salinity content
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               z2d(ji,jj) = tsn(ji,jj,mikt(ji,jj),jp_sal) * fse3t_n(ji,jj,mikt(ji,jj))
-            END DO
-         END DO  
-         CALL iom_put( "sss"  , z2d(:,:)                 )   ! sea surface salinity content
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               z2d(ji,jj) = tsn(ji,jj,mikt(ji,jj),jp_sal)**2 * fse3t_n(ji,jj,mikt(ji,jj))
-            END DO
-         END DO  
-         CALL iom_put( "sss2" , z2d(:,:)                 )   ! sea surface content of squared salinity
+         CALL iom_put( "sss"  , z3d(:,:,1)                 )   ! sea surface salinity content
+         z3d(:,:,1) = tsn(:,:,1,jp_sal) * z3d(:,:,1)
+         CALL iom_put( "sss2" , z3d(:,:,1)                 )   ! sea surface content of squared salinity
       ELSE
-         CALL iom_put( "toce" , tsn(:,:,:,jp_tem)        )   ! temperature
-         IF ( iom_use("sst") ) THEN
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  z2d(ji,jj) = tsn(ji,jj,mikt(ji,jj),jp_tem)
-               END DO
-            END DO
-            CALL iom_put( "sst"  , z2d(:,:)            ) ! sea surface temperature
-         ENDIF
-         IF ( iom_use("sst2") )   CALL iom_put( "sst2" , z2d(:,:) * z2d(:,:) ) ! square of sea surface temperature
+         CALL iom_put( "toce" , tsn(:,:,:,jp_tem)          )   ! temperature
+         CALL iom_put( "sst"  , tsn(:,:,1,jp_tem)          )   ! sea surface temperature
+         CALL iom_put( "sst2" , tsn(:,:,1,jp_tem) * tsn(:,:,1,jp_tem) ) ! square of sea surface temperature
          CALL iom_put( "soce" , tsn(:,:,:,jp_sal)          )   ! salinity
-         IF ( iom_use("sss") ) THEN
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  z2d(ji,jj) = tsn(ji,jj,mikt(ji,jj),jp_sal)
-               END DO
-            END DO
-            CALL iom_put( "sss"  , z2d(:,:)            ) ! sea surface salinity
-         ENDIF
-         CALL iom_put( "sss2" , z2d(:,:) * z2d(:,:) ) ! square of sea surface salinity
+         CALL iom_put( "sss"  , tsn(:,:,1,jp_sal)          )   ! sea surface salinity
+         CALL iom_put( "sss2" , tsn(:,:,1,jp_sal) * tsn(:,:,1,jp_sal) ) ! square of sea surface salinity
       END IF
       IF( lk_vvl .AND. (.NOT. ln_dynadv_vec) ) THEN
@@ -199 +167 @@
          CALL iom_put( "uoce" , umask(:,:,:) * un(:,:,:)                  )    ! i-current
          CALL iom_put( "voce" , vmask(:,:,:) * vn(:,:,:)                  )    ! j-current
-         IF ( iom_use("ssu") ) THEN
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  z2d(ji,jj) = un(ji,jj,miku(ji,jj))
-               END DO
-            END DO
-            CALL iom_put( "ssu"   , z2d                                    )    ! i-current
-         ENDIF
-         IF ( iom_use("ssv") ) THEN
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  z2d(ji,jj) = vn(ji,jj,mikv(ji,jj))
-               END DO
-            END DO
-            CALL iom_put( "ssv"   , z2d                                    )    ! j-current
-         ENDIF
       ENDIF
       CALL iom_put(    "avt"  , avt                        )    ! T vert. eddy diff. coef.