Changeset 4990 for trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

Timestamp:

2014-12-15T17:42:49+01:00 (9 years ago)

Author:

timgraham

Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -505 +505 @@
             btmsk(:,:,5) = MAX ( btmsk(:,:,3), btmsk(:,:,4) )          ! Indo-Pacific basin
             WHERE( gphit(:,:) < -30._wp)   ;   btm30(:,:) = 0._wp      ! mask out Southern Ocean
-            ELSE WHERE                     ;   btm30(:,:) = tmask(:,:,1)
+            ELSE WHERE                     ;   btm30(:,:) = ssmask(:,:)
             END WHERE
          ENDIF
@@ -573 +573 @@
       !!-------------------------------------------------------------------- 
       !
-      CALL wrk_alloc( jpj      , zphi , zfoo )
-      CALL wrk_alloc( jpj , jpk, z_1 )
+      CALL wrk_alloc( jpj       , zphi , zfoo )
+      CALL wrk_alloc( jpj , jpk , z_1  )
 
       ! define time axis