Changeset 7646 for trunk/NEMOGCM/NEMO/LIM_SRC_2/limdmp_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/limdmp_2.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90

@@ -144 +144 @@
       
          resto_ice(:,:,:) = 0._wp
-         !      Re-calculate the North and South boundary restoring term
-         !      because those boundaries may change with the prescribed zoom area.
          !
          irelax  = 16                     ! width of buffer zone with respect to close boundary
@@ -156 +154 @@
          ! REM: if there is no ice in the model and in the data, 
          !      no restoring even with non zero resto_ice
-         DO jj = mj0(jpjzoom - 1 + 1), mj1(jpjzoom -1 + irelax)
-            zreltim = zdmpmin + zfactor * ( mjg(jj) - jpjzoom + 1 )
+         DO jj = mj0(1), mj1( irelax)
+            zreltim = zdmpmin + zfactor * mjg(jj)
             resto_ice(:,jj,:) = 1._wp / ( zreltim * 86400._wp )
          END DO
 
          ! North boundary restoring term
-         DO jj =  mj0(jpjzoom -1 + jpjglo - irelax), mj1(jpjzoom - 1 + jpjglo)
-            zreltim = zdmpmin + zfactor * (jpjglo - ( mjg(jj) - jpjzoom + 1 ))
+         DO jj =  mj0(jpjglo - irelax), mj1(jpjglo)
+            zreltim = zdmpmin + zfactor * (jpjglo - mjg(jj))
             resto_ice(:,jj,:) = 1.e0 / ( zreltim * 86400 )
          END DO