Changeset 8086

Timestamp:

2017-05-30T09:24:22+02:00 (8 years ago)

Author:

cbricaud

Message:

add missing zdf_mxl_alloc in CRS branch

Location:

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO

Files:

• OPA_SRC/LDF/ldftra_substitute.h90 (modified) (1 diff)
• OPA_SRC/ZDF/zdfmxl.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcldf_crs.F90 (modified) (3 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_substitute.h90

@@ -62 +62 @@
 #      define   fsahtu_crs(i,j,k)   rldf * aht0 * r_fact_lap_crs(i,j,k)
 #      define   fsahtv_crs(i,j,k)   rldf * aht0
-#      define   fsahtw(_crsi,j,k)   rldf * aht0
+#      define   fsahtw_crs(i,j,k)   rldf * aht0
+
 #endif
 #endif

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

@@ -97 +97 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~ '
          !                             ! allocate zdfmxl arrays
+         IF( zdf_mxl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_mxl : unable to allocate arrays' )
       ENDIF
 

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf_crs.F90

@@ -18 +18 @@
    USE trc             ! ocean passive tracers variables
    USE trcnam_trp      ! passive tracers transport namelist variables
-   USE ldftra_oce      ! lateral diffusion coefficient on tracers
+   !USE ldftra_oce      ! lateral diffusion coefficient on tracers
+   USE ldftra_oce,ONLY: ln_traldf_grif,rn_aht_0,rn_ahtb_0,lk_traldf_eiv     ! lateral diffusion coefficient on tracers
    USE ldfslp          ! ???
    USE traldf_bilapg   ! lateral mixing            (tra_ldf_bilapg routine)
@@ -58 +59 @@
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
       !!
-      INTEGER            :: jn
+      INTEGER            :: ji,jj,jk,jn
+      REAL(wp)           :: zdep
       CHARACTER (len=22) :: charout
       REAL(wp), POINTER, DIMENSION(:,:,:,:) ::   ztrtrd
@@ -68 +70 @@
 
       rldf = rldf_rat
+      !
+      r_fact_lap(:,:,:) = 1.
+      DO jk= 1, jpk
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               IF( fsdept(ji,jj,jk) > 200. .AND. gphit(ji,jj) < 5. .AND. gphit(ji,jj) > -5. ) THEN
+                  zdep = MAX( fsdept(ji,jj,jk) - 1000., 0. ) / 1000.
+                  r_fact_lap(ji,jj,jk) = MAX( 1., rn_fact_lap * EXP( -zdep ) )
+               ENDIF
+            END DO
+         END DO
+      END DO
 
       IF( l_trdtrc )  THEN