Changeset 6570 for branches/CNRS/dev_r6568_Subduction_Diagnostics/NEMOGCM/NEMO/TOP_SRC/TRP

Timestamp:

2016-05-19T13:13:27+02:00 (8 years ago)

Author:

cetlod

Message:

1st implementation of subduction diag

Location:

branches/CNRS/dev_r6568_Subduction_Diagnostics/NEMOGCM/NEMO/TOP_SRC/TRP

Files:

• trcadv.F90 (modified) (2 diffs)
• trcdiasub.F90 (added)
• trcldf.F90 (modified) (4 diffs)
• trcrad.F90 (modified) (2 diffs)
• trczdf.F90 (modified) (3 diffs)

branches/CNRS/dev_r6568_Subduction_Diagnostics/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -27 +27 @@
    USE ldftra_oce      ! lateral diffusion coefficient on tracers
    USE prtctl_trc      ! Print control
+   USE diasub
+   USE trcdiasub
+
 
    IMPLICIT NONE
@@ -106 +109 @@
       zwn(:,:,jpk) = 0._wp                                                     ! no transport trough the bottom
 
-      IF( lk_traldf_eiv .AND. .NOT. ln_traldf_grif )   &  ! add the eiv transport (if necessary)
-         &              CALL tra_adv_eiv( kt, nittrc000, zun, zvn, zwn, 'TRC' )
+
+      IF( lk_diasub )  CALL trc_dia_sub_adv( kt, zun, zvn, zwn )  ! no eiv 
+
+      IF( lk_traldf_eiv .AND. .NOT. ln_traldf_grif )  THEN  ! add the eiv transport (if necessary)
+                          CALL tra_adv_eiv( kt, nittrc000, zun, zvn, zwn, 'TRC' )
+         IF( lk_diasub )  CALL trc_dia_sub_adv_eiv( kt, zun, zvn, zwn )  
+      ENDIF
+
       !
       IF( ln_mle    )   CALL tra_adv_mle( kt, nittrc000, zun, zvn, zwn, 'TRC' )    ! add the mle transport (if necessary)

branches/CNRS/dev_r6568_Subduction_Diagnostics/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90

@@ -28 +28 @@
    USE trdtra
    USE prtctl_trc      ! Print control
+   USE diasub
+   USE trcdiasub
+
 
    IMPLICIT NONE
@@ -60 +63 @@
       CHARACTER (len=22) :: charout
       REAL(wp), POINTER, DIMENSION(:,:,:,:) ::   ztrtrd
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) ::   ztfu, ztfv, ztfw
       !!----------------------------------------------------------------------
       !
@@ -84 +88 @@
          ztrtrd(:,:,:,:)  = tra(:,:,:,:)
       ENDIF
+      !
+      IF( lk_diasub ) THEN
+         CALL wrk_alloc( jpi, jpj, jpk, jptra, ztfu, ztfv, ztfw )
+         ztfu(:,:,:,:)  = 0.   ;   ztfv(:,:,:,:)  = 0.   ;   ztfw(:,:,:,:)  = 0.
+      ENDIF
 
       SELECT CASE ( nldf )                       ! compute lateral mixing trend and add it to the general trend
-      CASE ( 0 )   ;   CALL tra_ldf_lap   ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra        )  ! iso-level laplacian
-      CASE ( 1 )                                                                                            ! rotated laplacian
-                       IF( ln_traldf_grif ) THEN
-                          CALL tra_ldf_iso_grif( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )
-                       ELSE
-                          CALL tra_ldf_iso     ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra, rn_ahtb_0 )
-                       ENDIF
-      CASE ( 2 )   ;   CALL tra_ldf_bilap ( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra            )  ! iso-level bilaplacian
+      CASE ( 0 )                                              ! iso-level laplacian
+         IF( lk_diasub ) THEN ; CALL tra_ldf_lap( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra, ztfu, ztfv, ztfw )
+         ELSE                 ; CALL tra_ldf_lap( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra )  
+         ENDIF
+      CASE ( 1 )     
+         IF( ln_traldf_grif ) THEN
+            CALL tra_ldf_iso_grif( kt, nittrc000, 'TRC', gtru, gtrv, trb, tra, jptra, rn_ahtb_0 )
+         ELSE
+            IF( lk_diasub ) THEN 
+               CALL tra_ldf_iso( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra, rn_ahtb_0, ztfu, ztfv, ztfw ) 
+            ELSE                 
+               CALL tra_ldf_iso( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra, rn_ahtb_0 )
+            ENDIF
+         ENDIF
+      CASE ( 2 )                                               ! iso-level bilaplacian
+         IF( lk_diasub ) THEN ; CALL tra_ldf_bilap( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra, ztfu, ztfv, ztfw )
+         ELSE                 ; CALL tra_ldf_bilap( kt, nittrc000, 'TRC', gtru, gtrv, gtrui, gtrvi, trb, tra, jptra )  
+         ENDIF
       CASE ( 3 )   ;   CALL tra_ldf_bilapg( kt, nittrc000, 'TRC',             trb, tra, jptra            )  ! s-coord. horizontal bilaplacian
          !
@@ -123 +142 @@
       ENDIF
       !                                          ! print mean trends (used for debugging)
+      IF( lk_diasub ) THEN
+        CALL trc_dia_sub_ldf( kt, ztfu, ztfv, ztfw )
+        CALL wrk_dealloc( jpi, jpj, jpk, jptra, ztfu, ztfv, ztfw )
+      ENDIF
+      !                                               ! print mean trends (used for debugging)
       IF( ln_ctl )   THEN
          WRITE(charout, FMT="('ldf ')") ;  CALL prt_ctl_trc_info(charout)

branches/CNRS/dev_r6568_Subduction_Diagnostics/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90

@@ -28 +28 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id$ 
+   !! $Id$
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -61 +61 @@
       ENDIF
 
+      IF( lk_age     )   CALL trc_rad_sms( kt, trb, trn, jp_age0 , jp_age1               )  ! AGE tracer
       IF( lk_cfc     )   CALL trc_rad_sms( kt, trb, trn, jp_cfc0 , jp_cfc1               )  ! CFC model
       IF( lk_c14b    )   CALL trc_rad_sms( kt, trb, trn, jp_c14b0, jp_c14b1              )  ! bomb C14

branches/CNRS/dev_r6568_Subduction_Diagnostics/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90

@@ -22 +22 @@
    USE trdtra
    USE prtctl_trc      ! Print control
+   USE diasub
+   USE trcdiasub
+
 
    IMPLICIT NONE
@@ -79 +82 @@
       ENDIF
 
-      IF( l_trdtrc )  THEN
+      IF( l_trdtrc .OR. lk_diasub )  THEN
          CALL wrk_alloc( jpi, jpj, jpk, jptra, ztrtrd )
          ztrtrd(:,:,:,:)  = tra(:,:,:,:)
@@ -97 +100 @@
       END SELECT
 
-      IF( l_trdtrc )   THEN                      ! save the vertical diffusive trends for further diagnostics
+      IF( l_trdtrc .OR. lk_diasub )   THEN                      ! save the vertical diffusive trends for further diagnostics
          DO jn = 1, jptra
             DO jk = 1, jpkm1
                ztrtrd(:,:,jk,jn) = ( ( tra(:,:,jk,jn) - trb(:,:,jk,jn) ) / r2dt(jk) ) - ztrtrd(:,:,jk,jn)
             END DO
-            CALL trd_tra( kt, 'TRC', jn, jptra_zdf, ztrtrd(:,:,:,jn) )
+            IF( l_trdtrc  )  CALL trd_tra( kt, 'TRC', jn, jptra_zdf, ztrtrd(:,:,:,jn) ) !DC
          END DO
+         IF( lk_diasub )  CALL trc_dia_sub_zdf( kt, ztrtrd )
          CALL wrk_dealloc( jpi, jpj, jpk, jptra, ztrtrd )
       ENDIF
-      !                                          ! print mean trends (used for debugging)
+      !                        
       IF( ln_ctl )   THEN
          WRITE(charout, FMT="('zdf ')") ;  CALL prt_ctl_trc_info(charout)