Changeset 2517 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP

Timestamp:

2010-12-23T17:34:46+01:00 (14 years ago)

Author:

cetlod

Message:

v3.3beta:Ensure restartability of ORCA2_OFF_PISCES & define lk_offline flag for OFFLINE mode

Location:

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP

Files:

• trcadv.F90 (modified) (1 diff)
• trcbbl.F90 (modified) (1 diff)
• trcnxt.F90 (modified) (1 diff)
• trcsbc.F90 (modified) (1 diff)
• trctrp.F90 (modified) (3 diffs)
• trczdf.F90 (modified) (1 diff)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -69 +69 @@
 #if ! defined key_pisces
       IF( neuler == 0 .AND. kt == nit000 ) THEN     ! at nit000
-         r2dt(:) =  rdttra(:) * FLOAT(nn_dttrc)          ! = rdtra (restarting with Euler time stepping)
+         r2dt(:) =  rdttrc(:)           ! = rdttrc (restarting with Euler time stepping)
       ELSEIF( kt <= nit000 + nn_dttrc ) THEN          ! at nit000 or nit000+1
-         r2dt(:) = 2. * rdttra(:) * FLOAT(nn_dttrc)      ! = 2 rdttra (leapfrog)
+         r2dt(:) = 2. * rdttrc(:)       ! = 2 rdttrc (leapfrog)
       ENDIF
 #else
-      r2dt(:) =  rdttra(:) * FLOAT(nn_dttrc)          ! = rdtra (restarting with Euler time stepping)
+      r2dt(:) =  rdttrc(:)              ! = rdttrc (for PISCES use Euler time stepping)
 #endif
 

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90

@@ -56 +56 @@
       !!----------------------------------------------------------------------
 
-#if ! defined key_offline
-      ! Online coupling with dynamics  : Computation of bbl coef and bbl transport
-      ! Offline coupling with dynamics : Read bbl coef and bbl transport from input files
-      CALL bbl( kt, 'TRC' )
-      l_bbl = .FALSE. 
-#endif
+      IF( .NOT. lk_offline ) THEN
+         CALL bbl( kt, 'TRC' )         ! Online coupling with dynamics  : Computation of bbl coef and bbl transport
+         l_bbl = .FALSE.               ! Offline coupling with dynamics : Read bbl coef and bbl transport from input files
+      ENDIF
 
       IF( l_trdtrc )  THEN

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90

@@ -111 +111 @@
 
       ! set time step size (Euler/Leapfrog)
-      IF( neuler == 0 .AND. kt ==  nit000) THEN  ;  r2dt(:) =     rdttra(:) * FLOAT( nn_dttrc )  ! at nit000             (Euler)
-      ELSEIF( kt <= nit000 + 1 )           THEN  ;  r2dt(:) = 2.* rdttra(:) * FLOAT( nn_dttrc )  ! at nit000 or nit000+1 (Leapfrog)
+      IF( neuler == 0 .AND. kt ==  nit000) THEN  ;  r2dt(:) =     rdttrc(:)   ! at nit000             (Euler)
+      ELSEIF( kt <= nit000 + 1 )           THEN  ;  r2dt(:) = 2.* rdttrc(:)   ! at nit000 or nit000+1 (Leapfrog)
       ENDIF
 

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90

@@ -80 +80 @@
       IF( l_trdtrc ) ALLOCATE( ztrtrd(jpi,jpj,jpk) )
 
-#if ! defined key_offline
-      ! Concentration dilution effect on tracer due to evaporation, precipitation, and river runoff
-      IF( lk_vvl ) THEN                      ! volume variable
-         zemps(:,:) = emps(:,:) - emp(:,:)   
+      IF( lk_offline ) THEN          ! emps in dynamical files contains emps - rnf
+         zemps(:,:) = emps(:,:)  
+      ELSE                           ! Concentration dilution effect on tracer due to evaporation, precipitation, and river runoff
+         IF( lk_vvl ) THEN                      ! volume variable
+            zemps(:,:) = emps(:,:) - emp(:,:)   
 !!ch         zemps(:,:) = 0.
-      ELSE                                   ! linear free surface
-         IF( ln_rnf ) THEN  ;  zemps(:,:) = emps(:,:) - rnf(:,:)   !  E-P-R
-         ELSE               ;  zemps(:,:) = emps(:,:)
+         ELSE                                   ! linear free surface
+            IF( ln_rnf ) THEN  ;  zemps(:,:) = emps(:,:) - rnf(:,:)   !  E-P-R
+            ELSE               ;  zemps(:,:) = emps(:,:)
+            ENDIF 
          ENDIF 
       ENDIF 
-#else
-      ! emps in dynamical files contains emps - rnf
-      IF( lk_vvl ) THEN   ;   zemps(:,:) = 0.         ! No concentration/dilution effect 
-      ELSE                ;   zemps(:,:) = emps(:,:)  ! emps -rnf 
-      ENDIF
-#endif
 
       ! 0. initialization

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -18 +18 @@
    USE trabbl          ! bottom boundary layer               (trc_bbl routine)
    USE trcbbl          ! bottom boundary layer               (trc_bbl routine)
-#if ! defined key_offline
    USE zdfkpp          ! KPP non-local tracer fluxes         (trc_kpp routine)
-#endif
    USE trcdmp          ! internal damping                    (trc_dmp routine)
    USE trcldf          ! lateral mixing                      (trc_ldf routine)
@@ -67 +65 @@
                                 CALL trc_adv( kstp )            ! horizontal & vertical advection 
                                 CALL trc_ldf( kstp )            ! lateral mixing
-#if ! defined key_offline
-         IF( lk_zdfkpp )        CALL trc_kpp( kstp )            ! KPP non-local tracer fluxes
-#endif
+         IF( .NOT. lk_offline .AND. lk_zdfkpp )    &
+            &                   CALL trc_kpp( kstp )            ! KPP non-local tracer fluxes
 #if defined key_agrif
          IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_trc           ! tracers sponge
@@ -81 +78 @@
       ELSE                                               ! 1D vertical configuration
                                 CALL trc_sbc( kstp )            ! surface boundary condition
-#if ! defined key_offline
-          IF( lk_zdfkpp )       CALL trc_kpp( kstp )            ! KPP non-local tracer fluxes
-#endif
+         IF( .NOT. lk_offline .AND. lk_zdfkpp )    &
+            &                   CALL trc_kpp( kstp )            ! KPP non-local tracer fluxes
                                 CALL trc_zdf( kstp )            ! vertical mixing and after tracer fields
                                 CALL trc_nxt( kstp )            ! tracer fields at next time step     

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90

@@ -65 +65 @@
 #if ! defined key_pisces
       IF( neuler == 0 .AND. kt == nit000 ) THEN     ! at nit000
-         r2dt(:) =  rdttra(:) * FLOAT(nn_dttrc)          ! = rdtra (restarting with Euler time stepping)
+         r2dt(:) =  rdttrc(:)           ! = rdttrc (restarting with Euler time stepping)
       ELSEIF( kt <= nit000 + nn_dttrc ) THEN          ! at nit000 or nit000+1
-         r2dt(:) = 2. * rdttra(:) * FLOAT(nn_dttrc)      ! = 2 rdttra (leapfrog)
+         r2dt(:) = 2. * rdttrc(:)       ! = 2 rdttrc (leapfrog)
       ENDIF
 #else
-      r2dt(:) =  rdttra(:) * FLOAT(nn_dttrc)          ! = rdtra (restarting with Euler time stepping)
+      r2dt(:) =  rdttrc(:)              ! = rdttrc (for PISCES use Euler time stepping)
 #endif