Changeset 10047 for branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/DIA

Timestamp:

2018-08-08T17:12:35+02:00 (6 years ago)

Author:

jpalmier

Message:

merge with GO6_package_branch 9385-10020 ; plus debug OMIP_DIC

Location:

branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/DIA

Files:

• diadct.F90 (modified) (1 diff)
• diahth.F90 (modified) (1 diff)
• diaptr.F90 (modified) (2 diffs)
• diawri.F90 (modified) (4 diffs)

branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -1302 +1302 @@
 
    SUBROUTINE dia_dct_init          ! Dummy routine
-      WRITE(*,*) 'dia_dct_init: You should not have seen this print! error?', kt
+   IMPLICIT NONE
+      WRITE(*,*) 'dia_dct_init: You should not have seen this print! error?'
    END SUBROUTINE dia_dct_init
 
    SUBROUTINE dia_dct( kt )         ! Dummy routine
+   IMPLICIT NONE
       INTEGER, INTENT( in ) :: kt   ! ocean time-step index
       WRITE(*,*) 'dia_dct: You should not have seen this print! error?', kt

branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90

@@ -343 +343 @@
 CONTAINS
    SUBROUTINE dia_hth( kt )         ! Empty routine
-      WRITE(*,*) 'dia_hth: You should not have seen this print! error?', kt
+   IMPLICIT NONE
+    INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
+    WRITE(*,*) 'dia_hth: You should not have seen this print! error?', kt
    END SUBROUTINE dia_hth
 #endif

branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -102 +102 @@
 
       !
+      z2d(:,:) = 0._wp
       z3d(:,:,:) = 0._wp
       IF( PRESENT( pvtr ) ) THEN
@@ -246 +247 @@
          !
          IF( iom_use("zotemglo") ) THEN    ! i-mean i-k-surface 
+            zmask(:,:,:) = 0._wp
+            zts(:,:,:,:) = 0._wp
             DO jk = 1, jpkm1
                DO jj = 1, jpj

branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -246 +246 @@
             z3d(:,:,jk) = wn(:,:,jk) * z2d(:,:)
          END DO
+         CALL lbc_lnk( z3d(:,:,:), 'W', 1. )
          CALL iom_put( "w_masstr" , z3d )  
          IF( iom_use('w_masstr2') )   CALL iom_put( "w_masstr2", z3d(:,:,:) * z3d(:,:,:) )
@@ -252 +253 @@
       CALL iom_put( "avt" , avt                        )    ! T vert. eddy diff. coef.
       CALL iom_put( "avm" , avmu                       )    ! T vert. eddy visc. coef.
+#if defined key_zdftke
       IF( lk_zdftke ) THEN   
          CALL iom_put( "tke"      , en                               )    ! TKE budget: Turbulent Kinetic Energy   
          CALL iom_put( "tke_niw"  , e_niw                            )    ! TKE budget: Near-inertial waves   
       ENDIF 
+#endif
       CALL iom_put( "avs" , fsavs(:,:,:)               )    ! S vert. eddy diff. coef. (useful only with key_zdfddm)
                                                             ! Log of eddy diff coef
@@ -334 +337 @@
             z2d(:,:) = z2d(:,:) + z3d(:,:,jk)
          END DO
+         CALL lbc_lnk( z3d(:,:,:), 'U', -1. )
          CALL iom_put( "u_masstr", z3d )                  ! mass transport in i-direction
+         CALL lbc_lnk( z2d(:,:), 'U', -1. )
          CALL iom_put( "u_masstr_vint", z2d )             ! mass transport in i-direction vertical sum
       ENDIF
@@ -370 +375 @@
             z3d(:,:,jk) = rau0 * vn(:,:,jk) * e1v(:,:) * fse3v(:,:,jk) * vmask(:,:,jk)
          END DO
+         CALL lbc_lnk( z3d(:,:,:), 'V', -1. )
          CALL iom_put( "v_masstr", z3d )                  ! mass transport in j-direction
       ENDIF