Changeset 4569 for trunk/NEMOGCM/NEMO

Timestamp:

2014-03-25T18:43:26+01:00 (10 years ago)

Author:

vichi

Message:

Correct problem with reading mesh_mask in OFF_SRC, Ticket #1253

The reading of mesh mask information is now compliant with the
grid variables written in mesh_mask.nc.
Be aware that if one is using a mesh_mask generated with a previous
version of NEMO (<3.6) variable e3t must be renamed to e3t_0.
This commit also adds information on the date which may be needed
by other biogeochemical models.

Location:

trunk/NEMOGCM/NEMO/OFF_SRC

Files:

• domrea.F90 (modified) (6 diffs)
• istate.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OFF_SRC/domrea.F90

@@ -107 +107 @@
             CALL iom_open( 'mesh_zgr', inum4 ) ! create 'mesh_zgr.nc'
             CALL iom_open( 'mask'    , inum2 ) ! create 'mask.nc'
+
+            !                                  ! ===========================
+         CASE DEFAULT                          ! return error 
+            !                                  ! mesh has to be provided
+            !                                  ! ===========================
+            CALL ctl_stop( ' OFFLINE mode requires the input mesh mask(s). ',   &
+            &                                 ' Invalid nn_msh value in the namelist (0 is not allowed)' )
 
          END SELECT
@@ -173 +180 @@
             CALL iom_get( inum4, jpdom_unknown, 'esigw', esigw )
 
-            CALL iom_get( inum4, jpdom_data, 'e3t', fse3t_n(:,:,:) ) ! scale factors
-            CALL iom_get( inum4, jpdom_data, 'e3u', fse3u_n(:,:,:) )
-            CALL iom_get( inum4, jpdom_data, 'e3v', fse3v_n(:,:,:) )
-            CALL iom_get( inum4, jpdom_data, 'e3w', fse3w_n(:,:,:) )
+            CALL iom_get( inum4, jpdom_data, 'e3t_0', fse3t_n(:,:,:) ) ! scale factors
+            CALL iom_get( inum4, jpdom_data, 'e3u_0', fse3u_n(:,:,:) )
+            CALL iom_get( inum4, jpdom_data, 'e3v_0', fse3v_n(:,:,:) )
+            CALL iom_get( inum4, jpdom_data, 'e3w_0', fse3w_n(:,:,:) )
 
             CALL iom_get( inum4, jpdom_unknown, 'gdept_1d', gdept_1d ) ! depth
@@ -190 +197 @@
             !
             IF( nmsh <= 6 ) THEN                                        ! 3D vertical scale factors
-               CALL iom_get( inum4, jpdom_data, 'e3t', fse3t_n(:,:,:) )
-               CALL iom_get( inum4, jpdom_data, 'e3u', fse3u_n(:,:,:) )
-               CALL iom_get( inum4, jpdom_data, 'e3v', fse3v_n(:,:,:) )
-               CALL iom_get( inum4, jpdom_data, 'e3w', fse3w_n(:,:,:) )
+               CALL iom_get( inum4, jpdom_data, 'e3t_0', fse3t_n(:,:,:) )
+               CALL iom_get( inum4, jpdom_data, 'e3u_0', fse3u_n(:,:,:) )
+               CALL iom_get( inum4, jpdom_data, 'e3v_0', fse3v_n(:,:,:) )
+               CALL iom_get( inum4, jpdom_data, 'e3w_0', fse3w_n(:,:,:) )
             ELSE                                                        ! 2D bottom scale factors
                CALL iom_get( inum4, jpdom_data, 'e3t_ps', e3tp )
@@ -228 +235 @@
             END IF
 
-            IF( iom_varid( inum4, 'gdept', ldstop = .FALSE. ) > 0 ) THEN   ! 3D depth of t- and w-level
-               CALL iom_get( inum4, jpdom_data, 'gdept', fsdept_n(:,:,:) )
-               CALL iom_get( inum4, jpdom_data, 'gdepw', fsdepw_n(:,:,:) )
+            IF( iom_varid( inum4, 'gdept_0', ldstop = .FALSE. ) > 0 ) THEN   ! 3D depth of t- and w-level
+               CALL iom_get( inum4, jpdom_data, 'gdept_0', fsdept_n(:,:,:) )
+               CALL iom_get( inum4, jpdom_data, 'gdepw_0', fsdepw_n(:,:,:) )
             ELSE                                                           ! 2D bottom depth
                CALL iom_get( inum4, jpdom_data, 'hdept', zprt )
@@ -347 +354 @@
       !! ** Method  :   computes from mbathy with a minimum value of 1 over land
       !!
-      !! ** Action  : - update mbathy: level bathymetry (in level index)
+      !! ** Action  :   mbkt, mbku, mbkv :   vertical indices of the deeptest
+      !!                                     ocean level at t-, u- & v-points
+      !!                                     (min value = 1 over land)
       !!----------------------------------------------------------------------
       !
@@ -362 +371 @@
       !
       mbkt(:,:) = MAX( mbathy(:,:) , 1 )    ! bottom k-index of T-level (=1 over land)
-      !
+      !                                     ! bottom k-index of W-level = mbkt+1
       DO jj = 1, jpjm1                      ! bottom k-index of u- (v-) level
          DO ji = 1, jpim1

trunk/NEMOGCM/NEMO/OFF_SRC/istate.F90

@@ -12 +12 @@
    USE oce             ! ocean dynamics and active tracers 
    USE dom_oce         ! ocean space and time domain 
+   USE daymod          ! calendar
 
    IMPLICIT NONE
@@ -46 +47 @@
       rn2  (:,:,:) = 0.e0 
       !
+      CALL day_init                           ! model calendar (using both namelist and restart infos)
+
    END SUBROUTINE istate_init