Changeset 11604 for NEMO/branches/2019/ENHANCE-03_domcfg/src/domclo.F90

Timestamp:

2019-09-26T18:48:45+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-03_domcfg: remove useless variable in domclo and domutil + cosmetics changes (ticket #2143)

File:

• NEMO/branches/2019/ENHANCE-03_domcfg/src/domclo.F90 (modified) (14 diffs)

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

@@ -58 +58 @@
          CHARACTER(256) :: cloctrg                     ! where water is spread
          CHARACTER(256) :: cschtrg                     ! how   water is spread
-         REAL(wp)       :: radtrg                      ! radius of closed sea river mouth
+         REAL(wp)       :: radtrg                      ! radius of closed sea river mouth (used if cschtrg is rnf or emp)
          INTEGER        :: idtrg                       ! target id in case multiple lakes for the same river mouth
       END TYPE
@@ -70 +70 @@
       INTEGER :: nn_closea          ! number of closed seas
 
-      REAL(wp) :: zdistseed         ! distance to seed
-      REAL(wp) :: zarea             ! river mouth area
-      REAL(wp) :: rn_lon_opnsea, rn_lat_opnsea ! open sea seed
-      REAL(wp), DIMENSION(1)       :: zchk, zradtrg
-      REAL(wp), DIMENSION(jpi,jpj) :: zmsksrc, zmsktrg, zmsk_coastline, zdist
-
-      CHARACTER(256) :: csch, cloc        ! scheme name for water spreading (glo, rnf, emp)
-      TYPE(closea)  , DIMENSION(jp_closea)   :: sn_lake   ! lake properties
+      REAL(wp) :: zdistseed                         ! distance to seed
+      REAL(wp) :: zarea                             ! river mouth area
+      REAL(wp) :: rn_lon_opnsea, rn_lat_opnsea      ! open sea seed
+      REAL(wp), DIMENSION(1)       :: zchk, zradtrg !
+      REAL(wp), DIMENSION(jpi,jpj) :: zdist         ! distance to seed trg location
+      REAL(wp), DIMENSION(jpi,jpj) :: zmsksrc, zmsktrg, zmsk_coastline ! various mask
+
+      CHARACTER(256) :: csch, cloc                       ! scheme name for water spreading (glo, rnf, emp)
+      TYPE(closea)  , DIMENSION(jp_closea)   :: sn_lake  ! lake properties
 
       LOGICAL :: lskip     ! flag in case lake seed on land or already filled (...)
@@ -90 +91 @@
       NAMELIST/namclo/ rn_lon_opnsea, rn_lat_opnsea, nn_closea, sn_lake
       !!---------------------------------------------------------------------
-      PRINT *, rn_lon_opnsea, rn_lat_opnsea, nn_closea
-      !!
+      
       REWIND( numnam_ref )              ! Namelist namlbc in reference namelist : Lateral momentum boundary condition
       READ  ( numnam_ref, namclo, IOSTAT = ios, ERR = 901 )
@@ -118 +118 @@
       IF (zchk(1) == 0._wp) CALL ctl_stop( 'STOP', 'open sea seed is on land, please update namelist (rn_lon_opnsea,rn_lat_opnsea)' ) 
 
-      !! 1.3 set to 0 everything >0 and revert mask
+      !! print
       IF (lwp) THEN
          WRITE(numout,*)
@@ -128 +128 @@
       END IF
       
-      WHERE (msk_opnsea(:,:) > 0) msk_opnsea(:,:) = 0 ! mask all closed seas
-      WHERE (msk_opnsea(:,:) < 0) msk_opnsea(:,:) = 1 ! restore mask value
+      !! 1.3 set to 0 everything >0 and revert mask
+      WHERE (msk_opnsea(:,:) > 0._wp) msk_opnsea(:,:) = 0._wp ! mask all closed seas
+      WHERE (msk_opnsea(:,:) < 0._wp) msk_opnsea(:,:) = 1._wp ! restore mask value
 
       !! 1.4 Define closed sea mask (all of them, ie defined in the namelist or not)
       !! needed to remove the undefined closed seas at the end
-      msk_closea = (ssmask - msk_opnsea) * 99
+      msk_closea(:,:) = ( ssmask(:,:) - msk_opnsea(:,:) ) * 99._wp
 
       !!----------------------------------------------------------------------
@@ -142 +143 @@
       jglo = 1 ; jrnf = 1 ; jemp = 1
       !! mask used to group lake by net evap/precip distribution technics
-      msk_glo = msk_closea
-      msk_rnf = msk_closea
-      msk_emp = msk_closea
+      msk_glo(:,:) = msk_closea(:,:)
+      msk_rnf(:,:) = msk_closea(:,:)
+      msk_emp(:,:) = msk_closea(:,:)
 
       !! mask used to group multiple lake with the same river mouth (great lake for example)
-      msk_gloid = 0.0_wp
-      msk_rnfid = 0.0_wp
-      msk_empid = 0.0_wp
+      msk_gloid(:,:) = 0.0_wp
+      msk_rnfid(:,:) = 0.0_wp
+      msk_empid(:,:) = 0.0_wp
 
       IF (lwp) WRITE(numout,*)'closed seas: '
@@ -175 +176 @@
          CASE('glo')
             jsch = jglo
-            zmsksrc = msk_glo
-            zmsktrg = msk_gloid
+            zmsksrc(:,:) = msk_glo(:,:)
+            zmsktrg(:,:) = msk_gloid(:,:)
             IF (lwp) WRITE(numout,*)'        net evap/precip will be spread globally'
          CASE('rnf') 
             jsch = jrnf
-            zmsksrc = msk_rnf
-            zmsktrg = msk_rnfid
+            zmsksrc(:,:) = msk_rnf(:,:)
+            zmsktrg(:,:) = msk_rnfid(:,:)
             IF (lwp) WRITE(numout,*)'        net precip will be spread locally and net evap globally'
          CASE('emp')
             jsch = jemp 
-            zmsksrc = msk_emp
-            zmsktrg = msk_empid
+            zmsksrc(:,:) = msk_emp(:,:)
+            zmsktrg(:,:) = msk_empid(:,:)
             IF (lwp) WRITE(numout,*)'        net precip will be spread locally'
          CASE DEFAULT
@@ -213 +214 @@
             !! fill close sea mask with counter value
             CALL fill_pool( jiseed, jjseed, zmsksrc, REAL(jsch  ,8))
-            WHERE (zmsksrc == REAL(jsch,8))
+            WHERE (zmsksrc(:,:) == REAL(jsch,8))
                msk_closea = 0._wp
                zmsktrg    = sn_lake(jcs)%idtrg
@@ -220 +221 @@
             !! compute location of river mouth and distance to river mouth
             IF (cloc /= 'global') THEN
+
                !! set a minimum value for radius of the river influence
                zradtrg = 0._wp
@@ -229 +231 @@
                !! compute seed location for print 
                CALL dom_ngb(sn_lake(jcs)%rlontrg, sn_lake(jcs)%rlattrg, jiseed, jjseed, zdistseed, 'T')
+
                !! compute distance to river mouth
                zdist(:,:) = dist(sn_lake(jcs)%rlontrg, sn_lake(jcs)%rlattrg, glamt, gphit)
+
             END IF
 
@@ -237 +241 @@
             SELECT CASE (cloc)
             CASE ('global')
-               WHERE (msk_opnsea(:,:) == 1) zmsktrg = sn_lake(jcs)%idtrg
+               WHERE (msk_opnsea(:,:) == 1._wp) zmsktrg = sn_lake(jcs)%idtrg
 
             CASE ('local')
                !! compute mask
                WHERE (zdist(:,:) < zradtrg(1) .AND. msk_opnsea(:,:) == 1 ) zmsktrg = sn_lake(jcs)%idtrg
+
                !! print
                IF (lwp) WRITE(numout,'(a,f7.0,a,2f7.2,a,2i7,a)')'         river mouth area is defined by         points within ',zradtrg(1)         &
                              &        ,' m of lat/lon ', sn_lake(jcs)%rlontrg, sn_lake(jcs)%rlattrg                                  &
                              &        ,' (closest point is i/j ',jiseed, jjseed,')'
-  
             CASE ('coast')
                !! define coastline mask
@@ -259 +263 @@
                !! compute mask
                WHERE ( zdist(:,:) < zradtrg(1) .AND. zmsk_coastline(:,:) == 1 .AND. msk_opnsea(:,:) == 1 ) zmsktrg = sn_lake(jcs)%idtrg
+
                !! print
                IF (lwp) WRITE(numout,'(a,f7.0,a,2f7.2,a,2i7,a)')'         river mouth area is defined by coastal points within ',zradtrg(1) &
@@ -277 +282 @@
             CASE ('glo')
                jglo = jglo + 1
-               msk_glo   = zmsksrc
-               msk_gloid = zmsktrg
+               msk_glo(:,:)   = zmsksrc(:,:)
+               msk_gloid(:,:) = zmsktrg(:,:)
             CASE ('rnf')
                jrnf = jrnf + 1
-               msk_rnf   = zmsksrc
-               msk_rnfid = zmsktrg
+               msk_rnf(:,:)   = zmsksrc(:,:)
+               msk_rnfid(:,:) = zmsktrg(:,:)
             CASE ('emp')
                jemp = jemp + 1
-               msk_emp   = zmsksrc
-               msk_empid = zmsktrg
+               msk_emp(:,:)   = zmsksrc(:,:)
+               msk_empid(:,:) = zmsktrg(:,:)
             END SELECT
 
@@ -298 +303 @@
 
       !! mask all the cells not defined as closed sea
-      WHERE ( msk_glo == 99 ) msk_glo = 0
-      WHERE ( msk_rnf == 99 ) msk_rnf = 0
-      WHERE ( msk_emp == 99 ) msk_emp = 0
+      WHERE ( msk_glo(:,:) == 99._wp )  msk_glo = 0._wp
+      WHERE ( msk_rnf(:,:) == 99._wp )  msk_rnf = 0._wp
+      WHERE ( msk_emp(:,:) == 99._wp )  msk_emp = 0._wp
 
       !!  non defined closed sea
-      WHERE (msk_closea > 0) msk_closea = 1
+      WHERE ( msk_closea(:,:) > 0._wp ) msk_closea = 1._wp
 
    END SUBROUTINE dom_clo