Changeset 3865 for branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2013-04-09T18:34:38+02:00 (11 years ago)

Author:

acc

Message:

Branch 2013/dev_r3858_NOC_ZTC, #863. Nearly complete port of 2011/dev_r2739_LOCEAN8_ZTC development branch into v3.5aplha base. Compiles and runs but currently unstable after 8 timesteps with ORCA2_LIM reference configuration.

Location:

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC

Files:

• C14b/trcwri_c14b.F90 (modified) (1 diff)
• CFC/trcwri_cfc.F90 (modified) (1 diff)
• MY_TRC/trcwri_my_trc.F90 (modified) (1 diff)
• PISCES/trcwri_pisces.F90 (modified) (2 diffs)
• oce_trc.F90 (modified) (1 diff)

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/C14b/trcwri_c14b.F90

@@ -36 +36 @@
       DO jn = jp_c14b0, jp_c14b1
          cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer
-         CALL iom_put( cltra, trn(:,:,:,jn) )
+         IF( lk_vvl ) THEN
+            CALL iom_put( cltra, trn(:,:,:,jn) * fse3t_n(:,:,:) )
+         ELSE
+            CALL iom_put( cltra, trn(:,:,:,jn) )
+         ENDIF
       END DO
       !

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/CFC/trcwri_cfc.F90

@@ -36 +36 @@
       DO jn = jp_cfc0, jp_cfc1
          cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer
-         CALL iom_put( cltra, trn(:,:,:,jn) )
+         IF( lk_vvl ) THEN
+            CALL iom_put( cltra, trn(:,:,:,jn) * fse3t_n(:,:,:) )
+         ELSE
+            CALL iom_put( cltra, trn(:,:,:,jn) )
+         ENDIF
       END DO
       !

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90

@@ -36 +36 @@
       DO jn = jp_myt0, jp_myt1
          cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer
-         CALL iom_put( cltra, trn(:,:,:,jn) )
+         IF( lk_vvl ) THEN
+            CALL iom_put( cltra, trn(:,:,:,jn) * fse3t_n(:,:,:) )
+         ELSE
+            CALL iom_put( cltra, trn(:,:,:,jn) )
+         ENDIF
       END DO
       !

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90

@@ -39 +39 @@
       DO jn = jp_pcs0, jp_pcs1
          cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer
+         IF( lk_vvl ) THEN
+            CALL iom_put( cltra, trn(:,:,:,jn) * fse3t_n(:,:,:) )
+         ELSE
+            CALL iom_put( cltra, trn(:,:,:,jn) )
+         ENDIF
          CALL iom_put( cltra, trn(:,:,:,jn) * zrfact )
       END DO
@@ -47 +52 @@
          IF( jn == jppo4  )                 zrfact = po4r * 1.0e+6
          cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer
-         CALL iom_put( cltra, trn(:,:,:,jn) * zrfact )
+         IF( lk_vvl ) THEN
+            CALL iom_put( cltra, trn(:,:,:,jn) * fse3t_n(:,:,:) * zrfact )
+         ELSE
+            CALL iom_put( cltra, trn(:,:,:,jn) * zrfact )
+         ENDIF
       END DO
 #endif

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

@@ -77 +77 @@
    USE oce , ONLY :   sshb    =>    sshb    !: sea surface height at t-point [m]   
    USE oce , ONLY :   ssha    =>    ssha    !: sea surface height at t-point [m]   
-   USE oce , ONLY :   sshu_n  =>    sshu_n  !: sea surface height at u-point [m]   
-   USE oce , ONLY :   sshu_b  =>    sshu_b  !: sea surface height at u-point [m]   
-   USE oce , ONLY :   sshu_a  =>    sshu_a  !: sea surface height at u-point [m]   
-   USE oce , ONLY :   sshv_n  =>    sshv_n  !: sea surface height at v-point [m]   
-   USE oce , ONLY :   sshv_b  =>    sshv_b  !: sea surface height at v-point [m]   
-   USE oce , ONLY :   sshv_a  =>    sshv_a  !: sea surface height at v-point [m]   
-   USE oce , ONLY :   sshf_n  =>    sshf_n  !: sea surface height at v-point [m]   
    USE oce , ONLY :   l_traldf_rot => l_traldf_rot  !: rotated laplacian operator for lateral diffusion
 #if defined key_offline