Changeset 15023 for NEMO/trunk/src/OCE/DOM

Timestamp:

2021-06-18T16:35:25+02:00 (3 years ago)

Author:

gsamson

Message:

merge ticket2680_C1D_PAPA branch back into the trunk; see ticket #2680 for details

Location:

NEMO/trunk/src/OCE/DOM

Files:

• dom_oce.F90 (modified) (1 diff)
• domain.F90 (modified) (6 diffs)
• istate.F90 (modified) (3 diffs)

NEMO/trunk/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/trunk/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.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 +46 @@
    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
+   USE c1d
    !
    USE in_out_manager ! I/O manager
@@ -129 +128 @@
       CALL dom_tile_init                ! Tile domain
 
+      IF( ln_c1d )   CALL     c1d_init                    ! 1D column configuration
       !
       CALL dom_hgr                      ! Horizontal mesh
@@ -226 +226 @@
 #endif
 
-      !
-
-      IF( lk_c1d         )   CALL cor_c1d       ! 1D configuration: Coriolis set at T-point
       !
 
@@ -320 +317 @@
          &             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 +358 @@
          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/trunk/src/OCE/DOM/istate.F90

@@ -76 +76 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
 
-       CALL dta_tsd_init        ! Initialisation of T & S input data
-
-!      IF( lk_c1d )   CALL dta_uvd_init        ! Initialization of U & V input data
+      CALL dta_tsd_init                 ! Initialisation of T & S input data
+      IF( ln_c1d) CALL dta_uvd_init     ! Initialisation of U & V input data (c1d only)
 
       rhd  (:,:,:      ) = 0._wp   ;   rhop (:,:,:  ) = 0._wp      ! set one for all to 0 at level jpk
@@ -114 +113 @@
             !
             IF( ln_tsd_init ) THEN               
-               CALL dta_tsd( nit000, ts(:,:,:,:,Kbb) )       ! read 3D T and S data at nit000
-               !
+               CALL dta_tsd( nit000, ts(:,:,:,:,Kbb) )                     ! read 3D T and S data at nit000
+            ENDIF
+            !
+            IF( ln_uvd_init .AND. ln_c1d ) THEN               
+               CALL dta_uvd( nit000, Kbb, uu(:,:,:,Kbb), vv(:,:,:,Kbb) )   ! read 3D U and V data at nit000
+            ELSE
                uu  (:,:,:,Kbb) = 0._wp               ! set the ocean at rest
                vv  (:,:,:,Kbb) = 0._wp  
+            ENDIF
                !
-            ELSE                                 ! user defined initial T and S
+               !
+            IF( .NOT. ln_tsd_init .AND. .NOT. ln_uvd_init ) THEN
                DO jk = 1, jpk
                   zgdept(:,:,jk) = gdept(:,:,jk,Kbb)
@@ -129 +134 @@
             vv    (:,:,:,Kmm) = vv   (:,:,:,Kbb)
 
-         !
-!!gm ==>>>  to be moved in usrdef_istate of C1D case 
-         IF ( ln_uvd_init .AND. lk_c1d ) THEN ! read 3D U and V data at nit000
-            ALLOCATE( zuvd(jpi,jpj,jpk,2) )
-            CALL dta_uvd( nit000, Kbb, zuvd )
-            uu(:,:,:,Kbb) = zuvd(:,:,:,1)  ;  uu(:,:,:,Kmm) = uu(:,:,:,Kbb)
-            vv(:,:,:,Kbb) = zuvd(:,:,:,2)  ;  vv(:,:,:,Kmm) = vv(:,:,:,Kbb)
-            DEALLOCATE( zuvd )
-         ENDIF
-         !
-         ! 
          ENDIF 
 #if defined key_agrif