Changeset 7646 for trunk/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90

@@ -449 +449 @@
       soce_0(:,:) = soce                     ! constant SSS and ice salinity used in levitating sea-ice case
       sice_0(:,:) = sice
-      !
-      IF( cp_cfg == "orca" ) THEN            ! decrease ocean & ice reference salinities in the Baltic sea 
-         WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.   &
-            &   54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp         ) 
-            soce_0(:,:) = 4._wp
-            sice_0(:,:) = 2._wp
-         END WHERE
-      ENDIF
+      !                                      ! decrease ocean & ice reference salinities in the Baltic sea 
+      WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.   &
+         &   54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp         ) 
+         soce_0(:,:) = 4._wp
+         sice_0(:,:) = 2._wp
+      END WHERE
       !                                      ! embedded sea ice
       IF( nn_ice_embd /= 0 ) THEN            ! mass exchanges between ice and ocean (case 1 or 2) set the snow+ice mass
@@ -473 +471 @@
 !!gm
          IF( .NOT.ln_linssh ) THEN
-
-            do jk = 1,jpkm1                     ! adjust initial vertical scale factors
+            DO jk = 1,jpkm1                     ! adjust initial vertical scale factors
                e3t_n(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshn(:,:)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )
                e3t_b(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshb(:,:)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )
-            end do
+            END DO
             e3t_a(:,:,:) = e3t_b(:,:,:)
             ! Reconstruction of all vertical scale factors at now and before time steps