Changeset 4596 for branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

Timestamp:

2014-03-26T12:02:30+01:00 (10 years ago)

Author:

gm

Message:

#1260: LDF simplification + bilap iso-neutral for TRA and GYRE

File:

• branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (8 diffs)

branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -11 +11 @@
 
    !!----------------------------------------------------------------------
-   !!   dia_ptr      : Poleward Transport Diagnostics module
-   !!   dia_ptr_init : Initialization, namelist read
-   !!   dia_ptr_wri  : Output of poleward fluxes
-   !!   ptr_vjk      : "zonal" sum computation of a "meridional" flux array
-   !!   ptr_tjk      : "zonal" mean computation of a tracer field
-   !!   ptr_vj       : "zonal" and vertical sum computation of a "meridional" flux array
-   !!                   (Generic interface to ptr_vj_3d, ptr_vj_2d)
+   !!   dia_ptr       : Poleward Transport Diagnostics module
+   !!   dia_ptr_init  : Initialization, namelist read
+   !!   dia_ptr_wri   : Output of poleward fluxes
+   !!   ptr_vjk       : "zonal" sum computation of a "meridional" flux array
+   !!   ptr_tjk       : "zonal" mean computation of a tracer field
+   !!   ptr_vj        : "zonal" and vertical sum computation of a "meridional" flux array
+   !!                    (Generic interface to ptr_vj_3d, ptr_vj_2d)
    !!----------------------------------------------------------------------
-   USE oce              ! ocean dynamics and active tracers
-   USE dom_oce          ! ocean space and time domain
-   USE phycst           ! physical constants
-   USE ldftra_oce       ! ocean active tracers: lateral physics
-   USE dianam           !
-   USE iom              ! IOM library
-   USE ioipsl           ! IO-IPSL library
-   USE in_out_manager   ! I/O manager
+   USE oce            ! ocean dynamics and active tracers
+   USE dom_oce        ! ocean space and time domain
+   USE phycst         ! physical constants
+   USE ldftra         ! lateral physics: eddy diffusivity & EIV coeff.
+   !
+   USE dianam         !
+   USE iom            ! IOM library
+   USE ioipsl         ! IO-IPSL library
+   USE in_out_manager ! I/O manager
    USE lib_mpp          ! MPP library
    USE lbclnk           ! lateral boundary condition - processor exchanges
@@ -363 +364 @@
             END DO
 #if defined key_diaeiv
-            DO jn = 1, nptr                  ! bolus velocity
-               v_msf_eiv(:,:,jn) = ptr_vjk( v_eiv(:,:,:), btmsk(:,:,jn) )   ! here no btm30 for MSFeiv
-            END DO
-            !                                ! add bolus stream-function to the eulerian one
-            v_msf(:,:,:) = v_msf(:,:,:) + v_msf_eiv(:,:,:)
+!!gm            DO jn = 1, nptr                  ! bolus velocity
+!!               v_msf_eiv(:,:,jn) = ptr_vjk( v_eiv(:,:,:), btmsk(:,:,jn) )   ! here no btm30 for MSFeiv
+!!            END DO
+!!            !                                ! add bolus stream-function to the eulerian one
+!!gm            v_msf(:,:,:) = v_msf(:,:,:) + v_msf_eiv(:,:,:)
 #endif
             !
@@ -376 +377 @@
                DO jj = 2, jpj
                   DO ji = 1, jpi
-#if defined key_diaeiv 
-                     zv = ( vn(ji,jj,jk) + vn(ji,jj-1,jk) + v_eiv(ji,jj,jk) + v_eiv(ji,jj-1,jk) ) * 0.5_wp
-#else
+!!gm#if defined key_diaeiv 
+!!gm                     zv = ( vn(ji,jj,jk) + vn(ji,jj-1,jk) + v_eiv(ji,jj,jk) + v_eiv(ji,jj-1,jk) ) * 0.5_wp
+!!gm#else
                      zv = ( vn(ji,jj,jk) + vn(ji,jj-1,jk) ) * 0.5_wp
-#endif 
+!!gm#endif 
                      vt(ji,jj,jk) = zv * tsn(ji,jj,jk,jp_tem)
                      vs(ji,jj,jk) = zv * tsn(ji,jj,jk,jp_sal)
@@ -408 +409 @@
 
 #if defined key_diaeiv
-            DO jn = 1, nptr                  ! Bolus component
-               htr_eiv(:,jn) = SUM( v_msf_eiv(:,:,jn) * tn_jk(:,:,jn), 2 ) * rc_pwatt   ! SUM over jk
-               str_eiv(:,jn) = SUM( v_msf_eiv(:,:,jn) * sn_jk(:,:,jn), 2 ) * rc_ggram   ! SUM over jk
-            END DO
+!!gm            DO jn = 1, nptr                  ! Bolus component
+!!gm               htr_eiv(:,jn) = SUM( v_msf_eiv(:,:,jn) * tn_jk(:,:,jn), 2 ) * rc_pwatt   ! SUM over jk
+!!gm               str_eiv(:,jn) = SUM( v_msf_eiv(:,:,jn) * sn_jk(:,:,jn), 2 ) * rc_ggram   ! SUM over jk
+!!gm            END DO
 #endif
             !                                ! "Meridional" Stream-Function
@@ -418 +419 @@
                   v_msf    (:,jk,jn) = v_msf    (:,jk-1,jn) + v_msf    (:,jk,jn)       ! Eulerian j-Stream-Function
 #if defined key_diaeiv
-                  v_msf_eiv(:,jk,jn) = v_msf_eiv(:,jk-1,jn) + v_msf_eiv(:,jk,jn)       ! Bolus    j-Stream-Function
-
+!!gm                  v_msf_eiv(:,jk,jn) = v_msf_eiv(:,jk-1,jn) + v_msf_eiv(:,jk,jn)       ! Bolus    j-Stream-Function
+!!gm
 #endif
                END DO
@@ -425 +426 @@
             v_msf    (:,:,:) = v_msf    (:,:,:) * rc_sv       ! converte in Sverdrups
 #if defined key_diaeiv
-            v_msf_eiv(:,:,:) = v_msf_eiv(:,:,:) * rc_sv
+!!gm            v_msf_eiv(:,:,:) = v_msf_eiv(:,:,:) * rc_sv
 #endif
          ENDIF
@@ -554 +555 @@
       !! ** Method  :   NetCDF file
       !!----------------------------------------------------------------------
-      !!
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
-      !!
+      !
       INTEGER, SAVE ::   nhoridz, ndepidzt, ndepidzw
       INTEGER, SAVE ::   ndim  , ndim_atl     , ndim_pac     , ndim_ind     , ndim_ipc
       INTEGER, SAVE ::           ndim_atl_30  , ndim_pac_30  , ndim_ind_30  , ndim_ipc_30
       INTEGER, SAVE ::   ndim_h, ndim_h_atl_30, ndim_h_pac_30, ndim_h_ind_30, ndim_h_ipc_30
-      !!
+      !
       CHARACTER (len=40) ::   clhstnam, clop, clop_once, cl_comment   ! temporary names
       INTEGER            ::   iline, it, itmod, ji, jj, jk            !
@@ -568 +568 @@
 #endif
       REAL(wp)           ::   zsto, zout, zdt, zjulian                ! temporary scalars
-      !!
+      !
       REAL(wp), POINTER, DIMENSION(:)   ::   zphi, zfoo    ! 1D workspace
       REAL(wp), POINTER, DIMENSION(:,:) ::   z_1           ! 2D workspace