Changeset 181 for trunk/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2004-11-05T15:08:18+01:00 (19 years ago)

Author:

opalod

Message:

CT : UPDATE126 : improve MPI send possiblities with mpi_bsen and mpi_isend; update the search of extremum of scale factors in mpp

File:

• trunk/NEMO/OPA_SRC/DOM/domain.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DOM/domain.F90

@@ -344 +344 @@
       IF(lwp)WRITE(numout,*) 'dom_ctl : extrema of the masked scale factors'
       IF(lwp)WRITE(numout,*) '~~~~~~~'
-      ze1min = MINVAL( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )    
-      ze2min = MINVAL( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )    
-      ze1max = MAXVAL( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )    
-      ze2max = MAXVAL( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )    
-
-      IF( lk_mpp )   CALL mpp_min( ze1min )   ! min over the global domain
-      IF( lk_mpp )   CALL mpp_min( ze2min )
-      IF( lk_mpp )   CALL mpp_max( ze1max )   ! max over the global domain
-      IF( lk_mpp )   CALL mpp_max( ze2max )
-
-      iloc  = MINLOC( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )
-      iimi1 = iloc(1) + nimpp - 1
-      ijmi1 = iloc(2) + njmpp - 1
-      iloc  = MINLOC( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )
-      iimi2 = iloc(1) + nimpp - 1
-      ijmi2 = iloc(2) + njmpp - 1
-      iloc  = MAXLOC( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )
-      iima1 = iloc(1) + nimpp - 1
-      ijma1 = iloc(2) + njmpp - 1
-      iloc  = MAXLOC( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )
-      iima2 = iloc(1) + nimpp - 1
-      ijma2 = iloc(2) + njmpp - 1
-
-      IF( lk_mpp ) THEN
-!CT bug         CALL mpp_isl( iimi1 )
-!CT bug         CALL mpp_isl( ijmi1 )
-!CT bug         CALL mpp_isl( iimi2 )
-!CT bug         CALL mpp_isl( ijmi2 )
-!CT bug         CALL mpp_isl( iima1 )
-!CT bug         CALL mpp_isl( ijma1 )
-!CT bug         CALL mpp_isl( iima2 )
-!CT bug         CALL mpp_isl( ijma2 )
-      ENDIF
-
-      IF(lwp) THEN
-         IF(lk_mpp) THEN
-            WRITE(numout,cform_war)
-            WRITE(numout,*)'      Min(Max) of e1t, e2t are those of the first proc only'
-            WRITE(numout,*)
-         END IF
-         WRITE(numout,"(14x,'e1t maxi: ',1f10.2,' at i = ',i3,' j= ',i3)") ze1max, iima1, ijma1
-         WRITE(numout,"(14x,'e1t mini: ',1f10.2,' at i = ',i3,' j= ',i3)") ze1min, iimi1, ijmi1
-         WRITE(numout,"(14x,'e2t maxi: ',1f10.2,' at i = ',i3,' j= ',i3)") ze2max, iima2, ijma2
-         WRITE(numout,"(14x,'e2t mini: ',1f10.2,' at i = ',i3,' j= ',i3)") ze2min, iimi2, ijmi2
+
+      IF (lk_mpp) THEN
+         CALL mpp_minloc( e1t(:,:), tmask(:,:,1), ze1min, iimi1,ijmi1 )
+         CALL mpp_minloc( e2t(:,:), tmask(:,:,1), ze2min, iimi2,ijmi2 )
+         CALL mpp_maxloc( e1t(:,:), tmask(:,:,1), ze1max, iima1,ijma1 )
+         CALL mpp_maxloc( e2t(:,:), tmask(:,:,1), ze2max, iima2,ijma2 )
+      ELSE
+         ze1min = MINVAL( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )    
+         ze2min = MINVAL( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )    
+         ze1max = MAXVAL( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )    
+         ze2max = MAXVAL( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )    
+
+         iloc  = MINLOC( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )
+         iimi1 = iloc(1) + nimpp - 1
+         ijmi1 = iloc(2) + njmpp - 1
+         iloc  = MINLOC( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )
+         iimi2 = iloc(1) + nimpp - 1
+         ijmi2 = iloc(2) + njmpp - 1
+         iloc  = MAXLOC( e1t(:,:), mask = tmask(:,:,1) == 1.e0 )
+         iima1 = iloc(1) + nimpp - 1
+         ijma1 = iloc(2) + njmpp - 1
+         iloc  = MAXLOC( e2t(:,:), mask = tmask(:,:,1) == 1.e0 )
+         iima2 = iloc(1) + nimpp - 1
+         ijma2 = iloc(2) + njmpp - 1
+      ENDIF
+
+      IF(lwp) THEN
+         WRITE(numout,"(14x,'e1t maxi: ',1f10.2,' at i = ',i5,' j= ',i5)") ze1max, iima1, ijma1
+         WRITE(numout,"(14x,'e1t mini: ',1f10.2,' at i = ',i5,' j= ',i5)") ze1min, iimi1, ijmi1
+         WRITE(numout,"(14x,'e2t maxi: ',1f10.2,' at i = ',i5,' j= ',i5)") ze2max, iima2, ijma2
+         WRITE(numout,"(14x,'e2t mini: ',1f10.2,' at i = ',i5,' j= ',i5)") ze2min, iimi2, ijmi2
       ENDIF