Changeset 11986 for NEMO/branches

Timestamp:

2019-11-27T15:43:33+01:00 (4 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_domcfg: changes needed after Dave's review

Location:

NEMO/branches/2019/ENHANCE-02_ISF_domcfg

Files:

• namelist_ref (modified) (1 diff)
• src/domain.F90 (modified) (5 diffs)
• src/domwri.F90 (modified) (1 diff)

NEMO/branches/2019/ENHANCE-02_ISF_domcfg/namelist_ref

@@ -243 +243 @@
 &namctl        !   Control prints                                       (default: OFF)
 !-----------------------------------------------------------------------
-   ln_ctl = .TRUE.                 ! Toggle all report printing on/off (T/F); Ignored if sn_cfctl%l_config is T
+   ln_ctl = .FALSE.                 ! Toggle all report printing on/off (T/F); Ignored if sn_cfctl%l_config is T
      sn_cfctl%l_config = .TRUE.     ! IF .true. then control which reports are written with the following
        sn_cfctl%l_runstat = .FALSE. ! switches and which areas produce reports with the proc integer settings.

NEMO/branches/2019/ENHANCE-02_ISF_domcfg/src/domain.F90

@@ -28 +28 @@
    USE domclo          ! domain: set closed sea mask
    !
+   USE lib_mpp         !
    USE in_out_manager  ! I/O manager
    USE iom             ! 
@@ -80 +81 @@
       CALL dom_zgr                  ! Vertical mesh and bathymetry
       !
-      IF ( ln_domclo .OR. nmsh > 0 ) CALL dom_msk                  ! compute mask (needed by dom_clo
+      CALL dom_msk                  ! compute mask (needed by write_cfg)
       !
       IF ( ln_domclo ) CALL dom_clo ! Closed seas and lake
+      !
+      CALL dom_ctl                  ! print extrema of masked scale factors
       ! 
       CALL cfg_write                ! create the configuration file
@@ -256 +259 @@
       !!----------------------------------------------------------------------
       !
-#undef CHECK_DOM
-#ifdef CHECK_DOM
       IF(lk_mpp) THEN
-         CALL mpp_minloc( e1t(:,:), tmask_i(:,:), ze1min, iimi1,ijmi1 )
-         CALL mpp_minloc( e2t(:,:), tmask_i(:,:), ze2min, iimi2,ijmi2 )
-         CALL mpp_maxloc( e1t(:,:), tmask_i(:,:), ze1max, iima1,ijma1 )
-         CALL mpp_maxloc( e2t(:,:), tmask_i(:,:), ze2max, iima2,ijma2 )
+         CALL mpp_minloc( 'dom_ctl', e1t(:,:), tmask_i(:,:), ze1min, iloc )
+         iimi1 = iloc(1) ; ijmi1 = iloc(2)
+         CALL mpp_minloc( 'dom_ctl', e2t(:,:), tmask_i(:,:), ze2min, iloc )
+         iimi2 = iloc(1) ; ijmi2 = iloc(2)
+         CALL mpp_maxloc( 'dom_ctl', e1t(:,:), tmask_i(:,:), ze1max, iloc )
+         iima1 = iloc(1) ; ijma1 = iloc(2)
+         CALL mpp_maxloc( 'dom_ctl', e2t(:,:), tmask_i(:,:), ze2max, iloc )
+         iima2 = iloc(1) ; ijma2 = iloc(2)
       ELSE
          ze1min = MINVAL( e1t(:,:), mask = tmask_i(:,:) == 1._wp )    
@@ -291 +296 @@
          WRITE(numout,"(14x,'e2t mini: ',1f10.2,' at i = ',i5,' j= ',i5)") ze2min, iimi2, ijmi2
       ENDIF
-#endif
       !
    END SUBROUTINE dom_ctl
@@ -409 +413 @@
       CALL iom_rstput( 0, 0, inum, 'bottom_level' , REAL( mbkt, wp )*ssmask , ktype = jp_i4 )   ! nb of ocean T-points
       CALL iom_rstput( 0, 0, inum, 'top_level'    , REAL( mikt, wp )*ssmask , ktype = jp_i4 )   ! nb of ocean T-points (ISF)
-      DO jj = 1,jpj
-         DO ji = 1,jpi
-            z2d (ji,jj) = SUM ( e3t_0(ji,jj, 1:mbkt(ji,jj) ) ) * ssmask(ji,jj) 
-         END DO
-      END DO
-      CALL iom_rstput( 0, 0, inum, 'bathy_metry_e3'   , z2d , ktype = jp_r4 )
-      DO jj = 1,jpj
-         DO ji = 1,jpi
-            z2d (ji,jj) = SUM ( e3t_0(ji,jj, 1:mikt(ji,jj)-1 ) ) * ssmask(ji,jj) 
-         END DO
-      END DO
-      CALL iom_rstput( 0, 0, inum, 'isf_draft_e3'   , z2d , ktype = jp_r4 )
-      CALL iom_rstput( 0, 0, inum, 'isf_draft'   , risfdep , ktype = jp_r4 )
-      CALL iom_rstput( 0, 0, inum, 'bathy_metry'   , bathy , ktype = jp_r4 )
-      CALL iom_rstput( 0, 0, inum, 'hw',bathy-risfdep, ktype = jp_r4 )
-      CALL iom_rstput( 0, 0, inum, 'mhw',mbkt*ssmask-mikt*ssmask, ktype = jp_i4 )
+      CALL iom_rstput( 0, 0, inum, 'isf_draft'    , risfdep , ktype = jp_r8 )
+      CALL iom_rstput( 0, 0, inum, 'bathy_metry'  , bathy   , ktype = jp_r8 )
       !
       !                              !== closed sea ==!

NEMO/branches/2019/ENHANCE-02_ISF_domcfg/src/domwri.F90

@@ -154 +154 @@
       CALL iom_rstput( 0, 0, inum, 'ff_t', ff_t, ktype = jp_r8 )
       
-      ! note that mbkt is set to 1 over land ==> use surface tmask
+      ! note that mbkt and mikt is set to 1 over land ==> use surface tmask
       zprt(:,:) = ssmask(:,:) * REAL( mbkt(:,:) , wp )
-      CALL iom_rstput( 0, 0, inum, 'mbathy', zprt, ktype = jp_i4 )     !    ! nb of ocean T-points
+      CALL iom_rstput( 0, 0, inum, 'mbathy', zprt, ktype = jp_i4 )                              !    ! nb of ocean T-points
+      CALL iom_rstput( 0, 0, inum, 'bathy_metry', bathy(:,:)   * ssmask(:,:), ktype = jp_r8 )   !    ! bathymetry
       zprt(:,:) = ssmask(:,:) * REAL( mikt(:,:) , wp )
-      CALL iom_rstput( 0, 0, inum, 'misf', zprt, ktype = jp_i4 )       !    ! nb of ocean T-points
-      zprt(:,:) = ssmask(:,:) * REAL( risfdep(:,:) , wp )
-      CALL iom_rstput( 0, 0, inum, 'isfdraft', zprt, ktype = jp_r8 )   !    ! nb of ocean T-points
-      !                                                         ! vertical mesh
+      CALL iom_rstput( 0, 0, inum, 'misf', zprt, ktype = jp_i4 )                                !    ! first wet level
+      CALL iom_rstput( 0, 0, inum, 'isfdraft'   , risfdep(:,:) * ssmask(:,:), ktype = jp_r8 )   !    ! ice shelf draft
+      zprt(:,:) = ssmask(:,:) * REAL( mbkt(:,:) - mikt(:,:) + 1, wp )
+      CALL iom_rstput( 0, 0, inum, 'mhw',zprt, ktype = jp_i4 )
+      CALL iom_rstput( 0, 0, inum, 'hw' ,(bathy-risfdep)*ssmask, ktype = jp_r8 )
+
+      !                  ! vertical mesh
       CALL iom_rstput( 0, 0, inum, 'e3t_0', e3t_0, ktype = jp_r8  )    !    ! scale factors
       CALL iom_rstput( 0, 0, inum, 'e3u_0', e3u_0, ktype = jp_r8  )