Changeset 6101 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP

Timestamp:

2015-12-17T16:48:41+01:00 (8 years ago)

Author:

cbricaud

Message:

correction of bugs from last update and improvments for CRS

Location:

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP

Files:

• trcdmp.F90 (modified) (1 diff)
• trcldf_crs.F90 (modified) (1 diff)
• trcsbc.F90 (modified) (1 diff)
• trctrp.F90 (modified) (2 diffs)

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

@@ -24 +24 @@
    USE trdtra
    USE trd_oce
-   USE iom
+   USE iom , ONLY : iom_open, iom_get, iom_close, jpdom_autoglo
 
    IMPLICIT NONE

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

@@ -219 +219 @@
          IF(lwp) WRITE(numout,*) '          esopa control: use all lateral physics options'
          nldf = -1
-      ENDIF
-
-      IF( .NOT. ln_trcldf_diff ) THEN
-         IF(lwp) WRITE(numout,*) '          No lateral diffusion on passive tracers'
-         nldf = -2
       ENDIF
 

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

@@ -19 +19 @@
    USE trc             ! ocean  passive tracers variables
    USE prtctl_trc      ! Print control for debbuging
-   USE iom
+   USE iom, ONLY : iom_varid, iom_get, iom_rstput,jpdom_autoglo
    USE trd_oce
    USE trdtra

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

@@ -34 +34 @@
    USE zpshde          ! partial step: hor. derivative       (zps_hde routine)
    USE zpshde_crs      ! partial step: hor. derivative       (zps_hde routine)
-   USE dom_oce , ONLY : ln_crs
+   USE dom_oce , ONLY : ln_crs, ln_isfcav
    USE crs     , ONLY : jpi_crs,jpj_crs,wn_crs,ln_crs_top !cbr
    USE ldfslp_crs
-
 #if defined key_agrif
    USE agrif_top_sponge ! tracers sponges
@@ -111 +110 @@
                CALL zps_hde_crs( kstp, jptra, trn, gtru, gtrv )
             ELSE
-               IF( ln_isfcav)        &
+               IF( ln_isfcav )THEN
                   CALL zps_hde_isf( kstp, jptra, trn, pgtu=gtru, pgtv=gtrv, pgtui=gtrui, pgtvi=gtrvi )  ! Partial steps: now horizontal gradient of passive
                ELSE
                   CALL zps_hde    ( kstp, jptra, trn, gtru, gtrv )   ! Partial steps: now horizontal gradient of passive
                ENDIF
+            ENDIF
          ENDIF
                                                                 ! tracers at the bottom ocean level