Changeset 2977 for branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

Timestamp:

2011-10-22T15:46:41+02:00 (13 years ago)

Author:

cetlod

Message:

Add in branch 2011/dev_LOCEAN_2011 changes from 2011/dev_r2787_PISCES_improvment, 2011/dev_r2787_LOCEAN_offline_fldread and 2011/dev_r2787_LOCEAN3_TRA_TRP branches, see ticket #877

File:

• branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/stpctl.F90 (modified) (2 diffs)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

@@ -108 +108 @@
       !                                              !* Test minimum of salinity
       !                                              !  ------------------------
-      !! zsmin = MINVAL( sn(:,:,1), mask = tmask(:,:,1) == 1.e0 )  slower than the following loop on NEC SX5
+      !! zsmin = MINVAL( tsn(:,:,1,jp_sal), mask = tmask(:,:,1) == 1.e0 )  slower than the following loop on NEC SX5
       zsmin = 100.e0
       DO jj = 2, jpjm1
          DO ji = 1, jpi
-            IF( tmask(ji,jj,1) == 1) zsmin = MIN(zsmin,sn(ji,jj,1))
+            IF( tmask(ji,jj,1) == 1) zsmin = MIN(zsmin,tsn(ji,jj,1,jp_sal))
          END DO
       END DO
@@ -121 +121 @@
       IF( zsmin < 0.) THEN 
          IF (lk_mpp) THEN
-            CALL mpp_minloc ( sn(:,:,1),tmask(:,:,1), zsmin, ii,ij )
+            CALL mpp_minloc ( tsn(:,:,1,jp_sal),tmask(:,:,1), zsmin, ii,ij )
          ELSE
-            ilocs = MINLOC( sn(:,:,1), mask = tmask(:,:,1) == 1.e0 )
+            ilocs = MINLOC( tsn(:,:,1,jp_sal), mask = tmask(:,:,1) == 1.e0 )
             ii = ilocs(1) + nimpp - 1
             ij = ilocs(2) + njmpp - 1