Changeset 11129 for NEMO/branches/2019/ENHANCE-03_domcfg/src/domain.F90

Timestamp:

2019-06-18T17:11:36+02:00 (5 years ago)

Author:

mathiot

Message:

simplification of domcfg (rm all var_n and var_b as it is not needed) (ticket #2143)

Location:

NEMO/branches/2019/ENHANCE-03_domcfg

Files:

• . (copied) (copied from utils/tools_AGRIF_CMEMS_2020/DOMAINcfg)
• src/domain.F90 (modified) (4 diffs)

NEMO/branches/2019/ENHANCE-03_domcfg/src/domain.F90

@@ -21 +21 @@
    !!   dom_ctl        : control print for the ocean domain
    !!----------------------------------------------------------------------
-   USE oce             ! ocean variables
    USE dom_oce         ! domain: ocean
    USE phycst          ! physical constants
- !  USE closea          ! closed seas
+   !  USE closea          ! closed seas
    USE domhgr          ! domain: set the horizontal mesh
    USE domzgr          ! domain: set the vertical mesh
- !  USE domstp          ! domain: set the time-step
    USE dommsk          ! domain: set the mask system
    USE domwri          ! domain: write the meshmask file
-   USE domvvl          ! variable volume
    !
    USE in_out_manager  ! I/O manager
    USE iom             ! 
-   USE wrk_nemo        ! Memory Allocation
-   USE lib_mpp         ! distributed memory computing library
-   USE lbclnk          ! ocean lateral boundary condition (or mpp link)
-   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -74 +67 @@
       !!----------------------------------------------------------------------
       !
-     ! IF( nn_timing == 1 )   CALL timing_start('dom_init')
-      !
       IF(lwp) THEN
          WRITE(numout,*)
@@ -84 +75 @@
       !                       !==  Reference coordinate system  ==!
       !
-                     CALL dom_nam               ! read namelist ( namrun, namdom )
-                  !   CALL dom_clo               ! Closed seas and lake
-         
-                     CALL dom_hgr               ! Horizontal mesh
-                     CALL dom_zgr               ! Vertical mesh and bathymetry
-                     CALL dom_msk               ! Masks
+      CALL dom_nam               ! read namelist ( namrun, namdom )
+      !
+      !   CALL dom_clo               ! Closed seas and lake
+      ! 
+      CALL dom_hgr               ! Horizontal mesh
+      !
+      CALL dom_zgr               ! Vertical mesh and bathymetry
+      !
+      CALL dom_msk               ! Masks
       !
       ht_0(:,:) = e3t_0(:,:,1) * tmask(:,:,1)   ! Reference ocean thickness
@@ -100 +94 @@
       END DO
       !
-      !              !==  time varying part of coordinate system  ==!
-      !
-      IF( ln_linssh ) THEN          ! Fix in time : set to the reference one for all
-         !       before        !          now          !       after         !
-         ;  gdept_b = gdept_0  ;   gdept_n = gdept_0   !        ---          ! depth of grid-points
-         ;  gdepw_b = gdepw_0  ;   gdepw_n = gdepw_0   !        ---          !
-         ;                     ;   gde3w_n = gde3w_0   !        ---          !
-         !                                                                  
-         ;    e3t_b =   e3t_0  ;     e3t_n =   e3t_0   ;   e3t_a =  e3t_0    ! scale factors
-         ;    e3u_b =   e3u_0  ;     e3u_n =   e3u_0   ;   e3u_a =  e3u_0    !
-         ;    e3v_b =   e3v_0  ;     e3v_n =   e3v_0   ;   e3v_a =  e3v_0    !
-         ;                     ;     e3f_n =   e3f_0   !        ---          !
-         ;    e3w_b =   e3w_0  ;     e3w_n =   e3w_0   !        ---          !
-         ;   e3uw_b =  e3uw_0  ;    e3uw_n =  e3uw_0   !        ---          !
-         ;   e3vw_b =  e3vw_0  ;    e3vw_n =  e3vw_0   !        ---          !
-         !
-         CALL wrk_alloc( jpi,jpj,   z1_hu_0, z1_hv_0 )
-         !
-         z1_hu_0(:,:) = ssumask(:,:) / ( hu_0(:,:) + 1._wp - ssumask(:,:) )     ! _i mask due to ISF
-         z1_hv_0(:,:) = ssvmask(:,:) / ( hv_0(:,:) + 1._wp - ssvmask(:,:) )
-         !
-         !        before       !          now          !       after         !
-         ;                     ;      ht_n =    ht_0   !                     ! water column thickness
-         ;     hu_b =    hu_0  ;      hu_n =    hu_0   ;    hu_a =    hu_0   ! 
-         ;     hv_b =    hv_0  ;      hv_n =    hv_0   ;    hv_a =    hv_0   !
-         ;  r1_hu_b = z1_hu_0  ;   r1_hu_n = z1_hu_0   ; r1_hu_a = z1_hu_0   ! inverse of water column thickness
-         ;  r1_hv_b = z1_hv_0  ;   r1_hv_n = z1_hv_0   ; r1_hv_a = z1_hv_0   !
-         !
-         CALL wrk_dealloc( jpi,jpj,   z1_hu_0, z1_hv_0 )
-         !
-      ELSE                         ! time varying : initialize before/now/after variables
-         !
-         CALL dom_vvl_init 
-         !
-      ENDIF
-      !
-      CALL cfg_write         ! create the configuration file
-      !
-    !  IF( nn_timing == 1 )   CALL timing_stop('dom_init')
+      CALL cfg_write             ! create the configuration file
+      !
+      CALL dom_wri
       !
    END SUBROUTINE dom_init
-
 
    SUBROUTINE dom_nam