Changeset 15006

Timestamp:

2021-06-17T11:13:03+02:00 (3 years ago)

Author:

gsamson

Message:

continue C1D_PAPA cleaning (#2680): remove specific c1D step and dyn_cor routines

Location:

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE

Files:

• C1D/c1d.F90 (modified) (4 diffs)
• C1D/dyncor_c1d.F90 (deleted)
• C1D/step_c1d.F90 (deleted)
• DOM/dom_oce.F90 (modified) (1 diff)
• DOM/domain.F90 (modified) (5 diffs)
• DOM/istate.F90 (modified) (1 diff)
• IOM/iom.F90 (modified) (2 diffs)
• nemogcm.F90 (modified) (3 diffs)

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

@@ -28 +28 @@
    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 +46 @@
       INTEGER ::   ios   ! Local integer
       !!
-      NAMELIST/namc1d/ rn_lat1d, rn_lon1d , ln_c1d_locpt
+      NAMELIST/namc1d/ rn_lat1d, rn_lon1d
       !!----------------------------------------------------------------------
       !
@@ -64 +63 @@
          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
       !
@@ -76 +74 @@
    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

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/dom_oce.F90

@@ -38 +38 @@
    LOGICAL , PUBLIC ::   ln_1st_euler   !: =T start with forward time step or not (=F)
    LOGICAL , PUBLIC ::   ln_crs         !: Apply grid coarsening to dynamical model output or online passive tracers
+   LOGICAL , PUBLIC ::   ln_c1d         !: =T  single column domain (1x1 pt)
 
    !! Free surface parameters

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/domain.F90

@@ -11 +11 @@
    !!   NEMO     1.0  !  2002-08  (G. Madec)  F90: Free form and module
    !!            2.0  !  2005-11  (V. Garnier) Surface pressure gradient organization
-   !!            3.3  !  2010-11  (G. Madec)  initialisation in C1D configuration
    !!            3.6  !  2013     ( J. Simeon, C. Calone, G. Madec, C. Ethe ) Online coarsening of outputs
    !!            3.7  !  2015-11  (G. Madec, A. Coward)  time varying zgr by default
@@ -46 +45 @@
    USE dommsk         ! domain: set the mask system
    USE domwri         ! domain: write the meshmask file
-   USE c1d            ! 1D configuration
-   USE dyncor_c1d     ! 1D configuration: Coriolis term    (cor_c1d routine)
    USE wet_dry , ONLY : ll_wd     ! wet & drying flag
    USE closea  , ONLY : dom_clo   ! closed seas routine
@@ -228 +225 @@
       !
 
-      IF( lk_c1d         )   CALL cor_c1d       ! 1D configuration: Coriolis set at T-point
-      !
-
 #if defined key_agrif
       IF( .NOT. Agrif_Root() ) CALL Agrif_Init_Domain( Kbb, Kmm, Kaa )
@@ -320 +314 @@
          &             nn_stock, nn_write , ln_mskland  , ln_clobber   , nn_chunksz, ln_1st_euler  , &
          &             ln_cfmeta, ln_xios_read, nn_wxios
-      NAMELIST/namdom/ ln_linssh, rn_Dt, rn_atfp, ln_crs, ln_meshmask
+      NAMELIST/namdom/ ln_linssh, rn_Dt, rn_atfp, ln_crs, ln_c1d, ln_meshmask
       NAMELIST/namtile/ ln_tile, nn_ltile_i, nn_ltile_j
 #if defined key_netcdf4
@@ -361 +355 @@
          WRITE(numout,*) '      asselin time filter parameter           rn_atfp     = ', rn_atfp
          WRITE(numout,*) '      online coarsening of dynamical fields   ln_crs      = ', ln_crs
+         WRITE(numout,*) '      single column domain (1x1pt)            ln_c1d      = ', ln_c1d
       ENDIF
       !

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/istate.F90

@@ -29 +29 @@
    USE wet_dry         ! wetting and drying (needed for wad_istate)
    USE usrdef_istate   ! User defined initial state
+   USE c1d
    !
    USE in_out_manager  ! I/O manager

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/IOM/iom.F90

@@ -22 +22 @@
    USE dom_oce         ! ocean space and time domain
    USE domutl          !
-   USE c1d             ! 1D vertical configuration
    USE flo_oce         ! floats module declarations
    USE lbclnk          ! lateal boundary condition / mpp exchanges
@@ -1410 +1409 @@
 #endif
       ENDIF
-!some final adjustments
-      ! C1D case : always call lbc_lnk to replicate the central value over the whole 3X3 domain
-      IF( lk_c1d .AND. PRESENT(pv_r2d) )   CALL lbc_lnk( 'iom', pv_r2d,'Z',1.0_wp )
-      IF( lk_c1d .AND. PRESENT(pv_r3d) )   CALL lbc_lnk( 'iom', pv_r3d,'Z',1.0_wp )
 
       !--- Apply scale_factor and offset

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/nemogcm.F90

@@ -59 +59 @@
    USE dia25h  , ONLY : dia_25h_init   ! 25h mean output (initialisation)
    USE c1d            ! 1D configuration
-   USE step_c1d       ! Time stepping loop for the 1D configuration
 #if defined key_top
    USE trcini         ! passive tracer initialisation
@@ -143 +142 @@
       !
       istp = nit000
-      !
-#if defined key_c1d
-      DO WHILE ( istp <= nitend .AND. nstop == 0 )    !==  C1D time-stepping  ==!
-         CALL stp_c1d( istp )
-         istp = istp + 1
-      END DO
-#else
       !
 # if defined key_agrif
@@ -204 +196 @@
       !
 # endif
-      !
-#endif
       !
       IF( ln_diaobs   )   CALL dia_obs_wri