Changeset 11384 for branches/UKMO/dev_r5518_STOPACK/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90

Timestamp:

2019-07-31T18:05:50+02:00 (5 years ago)

Author:

mattmartin

Message:

Included Andrea Storto's STOPACK code into NEMO3.6 branch.

File:

• branches/UKMO/dev_r5518_STOPACK/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_STOPACK/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90

@@ -32 +32 @@
    USE wrk_nemo        ! Memory allocation
    USE timing          ! Timing
+   USE stopack
 
    IMPLICIT NONE
@@ -43 +44 @@
    REAL, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   t0_ldf, s0_ldf   !: lateral diffusion trends of T & S for a cst profile
    !                                                               !  (key_traldf_ano only)
+#if defined key_traldf_c3d
+   REAL, SAVE, ALLOCATABLE, DIMENSION(:,:,:) :: ahtu0,ahtv0,ahtw0,ahtt0
+#endif
+#if defined key_traldf_c2d
+   REAL, SAVE, ALLOCATABLE, DIMENSION(:,:  ) :: ahtu0,ahtv0,ahtw0,ahtt0
+#endif
 
    !! * Substitutions
@@ -68 +75 @@
       !
       rldf = 1     ! For active tracers the 
+      r_fact_lap(:,:,:) = 1.0
 
       IF( l_trdtra )   THEN                    !* Save ta and sa trends
@@ -74 +82 @@
          ztrds(:,:,:) = tsa(:,:,:,jp_sal)
       ENDIF
+
+#if defined key_traldf_c3d
+         IF( kt .eq. nit000 .and. (nn_spp_ahtu+nn_spp_ahtv+nn_spp_ahtw+nn_spp_ahtt) .gt. 0 ) THEN
+             ALLOCATE ( ahtu0(jpi,jpj,jpk), ahtv0(jpi,jpj,jpk) )
+             ALLOCATE ( ahtt0(jpi,jpj,jpk), ahtw0(jpi,jpj,jpk) )
+             ahtu0 = ahtu
+             ahtv0 = ahtv
+             ahtw0 = ahtw
+             ahtt0 = ahtt
+         ENDIF
+#endif
+#if defined key_traldf_c2d
+         IF( kt .eq. nit000 .and. (nn_spp_ahtu+nn_spp_ahtv+nn_spp_ahtw+nn_spp_ahtt) .gt. 0 ) THEN
+             ALLOCATE ( ahtu0(jpi,jpj), ahtv0(jpi,jpj) )
+             ALLOCATE ( ahtt0(jpi,jpj), ahtw0(jpi,jpj) )
+             ahtu0 = ahtu
+             ahtv0 = ahtv
+             ahtw0 = ahtw
+             ahtt0 = ahtt
+         ENDIF
+#endif
+#if defined key_traldf_c3d || defined key_traldf_c2d
+         IF( nn_spp_ahtu .GT. 0) THEN
+             ahtu = ahtu0
+             CALL spp_aht(kt,ahtu,nn_spp_ahtu,rn_ahtu_sd,jk_spp_ahtu)
+         ENDIF
+         IF( nn_spp_ahtv .GT. 0) THEN
+             ahtv = ahtv0
+             CALL spp_aht(kt,ahtv,nn_spp_ahtv,rn_ahtv_sd,jk_spp_ahtv)
+         ENDIF
+         IF( nn_spp_ahtw .GT. 0) THEN
+             ahtw = ahtw0
+             CALL spp_aht(kt,ahtw,nn_spp_ahtw,rn_ahtw_sd,jk_spp_ahtw)
+         ENDIF
+         IF( nn_spp_ahtt .GT. 0) THEN
+             ahtt = ahtt0
+             CALL spp_aht(kt,ahtt,nn_spp_ahtt,rn_ahtt_sd,jk_spp_ahtt)
+         ENDIF
+#endif
 
       SELECT CASE ( nldf )                       ! compute lateral mixing trend and add it to the general trend
@@ -214 +261 @@
       IF( ierr == 1 )   CALL ctl_stop( ' iso-level in z-coordinate - partial step, not allowed' )
       IF( ierr == 2 )   CALL ctl_stop( ' isoneutral bilaplacian operator does not exist' )
+      IF( ln_traldf_hor .AND. ln_traldf_grif )    &
+            &   CALL ctl_stop( ' horizontal operator and Griffies triads not available; sitch to isoneutral operator' )
+      IF( ln_traldf_grif .AND. ln_isfcav         )   &
+           CALL ctl_stop( ' ice shelf and traldf_grif not tested')
       IF( lk_traldf_eiv .AND. .NOT.ln_traldf_iso )   &
            CALL ctl_stop( '          eddy induced velocity on tracers',   &