Changeset 7485 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2016-12-12T09:33:37+01:00 (7 years ago)

Author:

cetlod

Message:

Remove CPP key key_offline and replace it with a logical l_offline

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• daymod.F90 (modified) (3 diffs)
• depth_e3.F90 (modified) (2 diffs)
• domain.F90 (modified) (2 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -26 +26 @@
    USE phycst         ! physical constants
    USE ioipsl  , ONLY :   ymds2ju      ! for calendar
-   USE trc_oce , ONLY :   lk_offline   ! offline flag
+   USE trc_oce , ONLY :   l_offline   ! offline flag
    !
    USE in_out_manager ! I/O manager
@@ -81 +81 @@
       ndt05   = NINT( 0.5 * rdt  )
 
-      IF( .NOT. lk_offline )   CALL day_rst( nit000, 'READ' )
+      IF( .NOT. l_offline )   CALL day_rst( nit000, 'READ' )
 
       ! set the calandar from ndastp (read in restart file and namelist)
@@ -273 +273 @@
       ENDIF
 
-      IF( .NOT. lk_offline ) CALL rst_opn( kt )               ! Open the restart file if needed and control lrst_oce
+      IF( .NOT. l_offline ) CALL rst_opn( kt )               ! Open the restart file if needed and control lrst_oce
       IF( lrst_oce         ) CALL day_rst( kt, 'WRITE' )      ! write day restart information
       !

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/depth_e3.F90

@@ -126 +126 @@
       INTEGER  ::   jk           ! dummy loop indices
       !!----------------------------------------------------------------------
-      !
-      pdepw_1d(1) = 0.0_wp
+      !
+      pdepw_1d(1) = 0.0_wp
       pdept_1d(1) = 0.5_wp * pe3w_1d(1)
-      DO jk = 2, jpk
+      DO jk = 2, jpk
          pdepw_1d(jk) = pdepw_1d(jk-1) + pe3t_1d(jk-1) 
          pdept_1d(jk) = pdept_1d(jk-1) + pe3w_1d(jk  ) 
@@ -152 +152 @@
       INTEGER  ::   jk           ! dummy loop indices
       !!----------------------------------------------------------------------      
-      !
-      pdepw_3d(:,:,1) = 0.0_wp
+      !
+      pdepw_3d(:,:,1) = 0.0_wp
       pdept_3d(:,:,1) = 0.5_wp * pe3w_3d(:,:,1)
-      DO jk = 2, jpk
+      DO jk = 2, jpk
          pdepw_3d(:,:,jk) = pdepw_3d(:,:,jk-1) + pe3t_3d(:,:,jk-1) 
          pdept_3d(:,:,jk) = pdept_3d(:,:,jk-1) + pe3w_3d(:,:,jk  ) 

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -40 +40 @@
    USE dyncor_c1d     ! 1D configuration: Coriolis term    (cor_c1d routine)
    !
+   USE trc_oce , ONLY :   l_offline    ! passive tracers offline flag
+   !
    USE in_out_manager ! I/O manager
    USE iom            ! I/O library
@@ -178 +180 @@
       ELSE                       != time varying : initialize before/now/after variables
          !
-         IF( .NOT.lk_offline )  CALL dom_vvl_init 
+         IF( .NOT.l_offline )  CALL dom_vvl_init 
          !
       ENDIF