Changeset 439 for trunk/NEMO/TOP_SRC

Timestamp:

2006-04-11T15:52:28+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_045 : CT : modifications to be able to run 1D on-line & off-line passive tracers configurations

Location:

trunk/NEMO/TOP_SRC

Files:

• TRP/trcbbl.F90 (modified) (1 diff)
• TRP/trcstp.F90 (modified) (3 diffs)
• TRP/trctrp.F90 (modified) (1 diff)
• TRP/trctrp_ctl.F90 (modified) (2 diffs)
• trc.F90 (modified) (1 diff)

trunk/NEMO/TOP_SRC/TRP/trcbbl.F90

@@ -5 +5 @@
    !!                                  layer scheme
    !!==============================================================================
-#if  defined key_passivetrc && ( defined key_trcbbl_dif   ||   defined key_trcbbl_adv )
+#if  defined key_passivetrc && ( defined key_trcbbl_dif   ||   defined key_trcbbl_adv ) && ! defined key_cfg_1d
    !!----------------------------------------------------------------------
    !!   'key_trcbbl_dif'   or            diffusive bottom boundary layer

trunk/NEMO/TOP_SRC/TRP/trcstp.F90

@@ -12 +12 @@
    USE trc              ! ocean passive tracers variables 
    USE trctrp           ! passive tracers transport
-   USE trctrp1d         ! passive tracers transport 1D configuration
    USE trcsms           ! passive tracers sources and sinks
    USE prtctl_trc       ! Print control for debbuging
@@ -18 +17 @@
    USE trcdit
    USE trcrst
-   USE ini1d
 
    IMPLICIT NONE
@@ -70 +68 @@
 
       ! transport of passive tracers
-      IF( lk_cfg_1d  )  THEN
-         CALL trc_trp_1d( kt )   
-      ELSE
-         CALL trc_trp( kt )
-      ENDIF
-
+      CALL trc_trp( kt )
 
       IF(ln_ctl)   THEN  ! print mean trends (used for debugging)

trunk/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -128 +128 @@
       !                                                      
 
-       IF( lk_zps           )   CALL zps_hde_trc( kt, trb, gtru, gtrv )  ! Partial steps: now horizontal gradient
+      IF( lk_zps .AND. .NOT. lk_trccfg_1d ) &
+         &                     CALL zps_hde_trc( kt, trb, gtru, gtrv )  ! Partial steps: now horizontal gradient
       !                                                                 ! of passive tracers at the bottom ocean level
 

trunk/NEMO/TOP_SRC/TRP/trctrp_ctl.F90

@@ -125 +125 @@
          IF(lwp) WRITE(numout,*) '     cross-land advection only with 2nd order advection scheme'
          nstop = nstop + 1
+      ENDIF
+
+      IF( lk_trccfg_1d ) THEN
+         ln_trcadv_cen2   = .FALSE.    ;  ln_trcadv_tvd    = .FALSE. ; ln_trcadv_muscl  = .FALSE.
+         ln_trcadv_muscl2 = .FALSE.    ;  ln_trcadv_smolar = .FALSE.
+         IF(lwp) WRITE(numout,*) ' *******  1D configuration : No advection on passive tracers *******'
+         IF(lwp) WRITE(numout,*) ' *******                                                     *******'
       ENDIF
 
@@ -236 +243 @@
       ENDIF
 
-      IF( .NOT. ln_trcldf_diff ) THEN
+      IF( .NOT. ln_trcldf_diff .OR. lk_trccfg_1d ) THEN
          l_trcldf_lap = .FALSE.   ;   l_trcldf_bilap   = .FALSE.   ;   l_trcldf_bilapg  = .FALSE.
          l_trcldf_iso = .FALSE.   ;   l_trcldf_iso_zps = .FALSE.
          l_trczdf_iso = .FALSE.   ;   l_trczdf_iso_vo  = .FALSE.
-         IF(lwp ) WRITE(numout,*) '          No lateral physics on passive tracers'
+         IF(lwp ) WRITE(numout,*) '************* No lateral physics on passive tracers *****************'
+         IF(lwp ) WRITE(numout,*) '*************                                       *****************'
       ELSE
          ! ... Space variation of eddy coefficients

trunk/NEMO/TOP_SRC/trc.F90

@@ -198 +198 @@
 #endif
 
+  !!  1D configuration
+  !! --------------------------------------------------
+#if defined key_cfg_1d
+      LOGICAL, PARAMETER ::   lk_trccfg_1d   = .TRUE.   !: 1D pass. tracer configuration flag
+#else   
+      LOGICAL, PARAMETER ::   lk_trccfg_1d   = .FALSE.  !: 1D pass. tracer configuration flag
+#endif
+
+
 #else
    !!======================================================================