Changeset 15574 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/C1D/c1d.F90

Timestamp:

2021-12-03T20:32:50+01:00 (3 years ago)

Author:

techene

Message:

#2605 #2715 trunk merged into dev_r14318_RK3_stage1

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1

Files:

• . (modified) (1 prop)
• src/OCE/C1D/c1d.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/C1D/c1d.F90

@@ -8 +8 @@
    !!            3.5  !  2013-10 (D. Calvert)  add namelist
    !!----------------------------------------------------------------------
-#if defined key_c1d
-   !!----------------------------------------------------------------------
-   !!   'key_c1d'                                   1D column configuration
+
    !!----------------------------------------------------------------------
    !!   c1d_init      : read in the C1D namelist
@@ -24 +22 @@
    PUBLIC   c1d_init   ! called by nemogcm.F90
 
-   LOGICAL , PUBLIC, PARAMETER ::  lk_c1d = .TRUE.   ! 1D config. flag
-
    REAL(wp), PUBLIC ::  rn_lat1d     !: Column latitude
    REAL(wp), PUBLIC ::  rn_lon1d     !: Column longitude
-   LOGICAL , PUBLIC ::  ln_c1d_locpt !: Localization (or not) of 1D column in a grid
 
    !!----------------------------------------------------------------------
@@ -47 +42 @@
       INTEGER ::   ios   ! Local integer
       !!
-      NAMELIST/namc1d/ rn_lat1d, rn_lon1d , ln_c1d_locpt
+      NAMELIST/namc1d/ rn_lat1d, rn_lon1d
       !!----------------------------------------------------------------------
       !
@@ -64 +59 @@
          WRITE(numout,*) '      column latitude                 rn_lat1d     = ', rn_lat1d
          WRITE(numout,*) '      column longitude                rn_lon1d     = ', rn_lon1d
-         WRITE(numout,*) '      column localization in a grid   ln_c1d_locpt = ', ln_c1d_locpt
       ENDIF
       !
    END SUBROUTINE c1d_init
 
-#else
-   !!----------------------------------------------------------------------
-   !!   Dummy module :                           No use of 1D configuration
-   !!----------------------------------------------------------------------
-   USE par_kind         ! kind parameters
-   LOGICAL, PUBLIC, PARAMETER ::   lk_c1d = .FALSE.   !: 1D config. flag de-activated
-   REAL(wp)                   ::   rn_lat1d, rn_lon1d
-   LOGICAL , PUBLIC           ::   ln_c1d_locpt = .FALSE. 
-CONTAINS
-   SUBROUTINE c1d_init               ! Dummy routine
-   END SUBROUTINE c1d_init
-#endif
-
    !!======================================================================
 END MODULE c1d

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+