Changeset 15588 for NEMO/branches/UKMO/r14075_maxval_cce

Timestamp:

2021-12-09T13:30:34+01:00 (2 years ago)

Author:

jcastill

Message:

Changes to make the code work with cce 8.7.7

Location:

NEMO/branches/UKMO/r14075_maxval_cce/src/OCE

Files:

• DOM/domain.F90 (modified) (1 diff)
• DOM/domngb.F90 (modified) (1 diff)
• OBS/obs_averg_h2d.F90 (modified) (1 diff)
• stpctl.F90 (modified) (2 diffs)

NEMO/branches/UKMO/r14075_maxval_cce/src/OCE/DOM/domain.F90

@@ -485 +485 @@
          CALL mpp_maxloc( 'domain', e2t(:,:), tmask_i(:,:), ze2max, ima2 )
       ELSE
-         ze1min = MINVAL( e1t(:,:), mask = tmask_i(:,:) == 1._wp )    
-         ze2min = MINVAL( e2t(:,:), mask = tmask_i(:,:) == 1._wp )    
-         ze1max = MAXVAL( e1t(:,:), mask = tmask_i(:,:) == 1._wp )    
-         ze2max = MAXVAL( e2t(:,:), mask = tmask_i(:,:) == 1._wp )    
-         !
-         iloc  = MINLOC( e1t(:,:), mask = tmask_i(:,:) == 1._wp )
+         ze1max = MAXVAL( e1t(:,:)*tmask_i(:,:) )    
+         ze2max = MAXVAL( e2t(:,:)*tmask_i(:,:) )    
+         ze1min = ze1max - MAXVAL( (ze1max-e1t(:,:))*tmask_i(:,:) )    
+         ze2min = ze2max - MAXVAL( (ze2max-e2t(:,:))*tmask_i(:,:) )    
+         !
+         iloc  = MAXLOC( (ze1max-e1t(:,:))*tmask_i(:,:) )
          imi1(1) = iloc(1) + nimpp - 1
          imi1(2) = iloc(2) + njmpp - 1
-         iloc  = MINLOC( e2t(:,:), mask = tmask_i(:,:) == 1._wp )
+         iloc  = MAXLOC( (ze2max-e2t(:,:))*tmask_i(:,:) )
          imi2(1) = iloc(1) + nimpp - 1
          imi2(2) = iloc(2) + njmpp - 1
-         iloc  = MAXLOC( e1t(:,:), mask = tmask_i(:,:) == 1._wp )
+         iloc  = MAXLOC( e1t(:,:)*tmask_i(:,:) )
          ima1(1) = iloc(1) + nimpp - 1
          ima1(2) = iloc(2) + njmpp - 1
-         iloc  = MAXLOC( e2t(:,:), mask = tmask_i(:,:) == 1._wp )
+         iloc  = MAXLOC( e2t(:,:)*tmask_i(:,:) )
          ima2(1) = iloc(1) + nimpp - 1
          ima2(2) = iloc(2) + njmpp - 1

NEMO/branches/UKMO/r14075_maxval_cce/src/OCE/DOM/domngb.F90

@@ -70 +70 @@
          kii = iloc(1) ; kjj = iloc(2)
       ELSE
-         iloc(:) = MINLOC( zdist(:,:), mask = zmask(:,:) == 1.e0 )
+         zmini = MAXVAL( zdist(:,:)*zmask(:,:) )
+         iloc(:) = MAXLOC( (zmini-zdist(:,:))*zmask(:,:) )
          kii = iloc(1) + nimpp - 1
          kjj = iloc(2) + njmpp - 1

NEMO/branches/UKMO/r14075_maxval_cce/src/OCE/OBS/obs_averg_h2d.F90

@@ -612 +612 @@
          ENDIF
 
-         ze1min = MINVAL( e1t(:,:), mask = pmask(:,:) == 1._wp )
-         ze2min = MINVAL( e2t(:,:), mask = pmask(:,:) == 1._wp )
+         ze1min = MAXVAL( e1t(:,:)*pmask(:,:) )
+         ze2min = MAXVAL( e2t(:,:)*pmask(:,:) )
+
+         ze1min = ze1min - MAXVAL( (ze1min-e1t(:,:))*pmask(:,:) )
+         ze2min = ze2min - MAXVAL( (ze2min-e2t(:,:))*pmask(:,:) )
          
          IF(lk_mpp) THEN

NEMO/branches/UKMO/r14075_maxval_cce/src/OCE/stpctl.F90

@@ -129 +129 @@
       llmsk(:,:,:) = tmask(:,:,:) == 1._wp
       IF( COUNT( llmsk(:,:,:) ) > 0 ) THEN   ! avoid huge values sent back for land processors...      
-         zmax(3) = MAXVAL( -tsn(:,:,:,jp_sal) , mask = llmsk )   ! minus salinity max
-         zmax(4) = MAXVAL(  tsn(:,:,:,jp_sal) , mask = llmsk )   !       salinity max
+         zmax(4) = MAXVAL(  tsn(:,:,:,jp_sal)*tmask )            !       salinity max
+         zmax(3) = MAXVAL( (zmax(4)-tsn(:,:,:,jp_sal))*tmask ) - zmax(4)          ! minus salinity max
          IF( ll_colruns .OR. jpnij == 1 ) THEN     ! following variables are used only in the netcdf file
-            zmax(5) = MAXVAL( -tsn(:,:,:,jp_tem) , mask = llmsk )   ! minus temperature max
-            zmax(6) = MAXVAL(  tsn(:,:,:,jp_tem) , mask = llmsk )   !       temperature max
+            zmax(6) = MAXVAL(  tsn(:,:,:,jp_tem)*tmask )         !       temperature max
+            zmax(5) = zmax(6) - MAXVAL( (zmax(6)-tsn(:,:,:,jp_tem))*tmask )        ! minus temperature max
             IF( ln_zad_Aimp ) THEN
-               zmax(9) = MAXVAL(   Cu_adv(:,:,:)   , mask = llmsk ) ! partitioning coeff. max
+               zmax(9) = MAXVAL(   Cu_adv(:,:,:)*tmask )         ! partitioning coeff. max
                llmsk(:,:,:) = wmask(:,:,:) == 1._wp
                IF( COUNT( llmsk(:,:,:) ) > 0 ) THEN   ! avoid huge values sent back for land processors...
-                  zmax(8) = MAXVAL(  ABS( wi(:,:,:) ) , mask = wmask(:,:,:) == 1._wp ) ! implicit vertical vel. max
+                  zmax(8) = MAXVAL( ABS( wi(:,:,:) )*wmask(:,:,:) ) ! implicit vertical vel. max
                ENDIF
             ENDIF
@@ -193 +193 @@
             ih(1:2)= MAXLOC( ABS( sshn(:,:)   )                              ) + (/ nimpp - 1, njmpp - 1    /)   ;   ih(3) = 0
             iu(:)  = MAXLOC( ABS( un  (:,:,:) )                              ) + (/ nimpp - 1, njmpp - 1, 0 /)
-            is1(:) = MINLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /)
-            is2(:) = MAXLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /)
+            is1(:) = MAXLOC( (zmax(4)-tsn(:,:,:,jp_sal))*tmask(:,:,:) ) + (/ nimpp - 1, njmpp - 1, 0 /)
+            is2(:) = MAXLOC( tsn(:,:,:,jp_sal)*tmask(:,:,:) ) + (/ nimpp - 1, njmpp - 1, 0 /)
             iareamin(:) = narea   ;   iareamax(:) = narea   ;   iareasum(:) = 1         ! this is local information
          ENDIF