Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.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/OPA_SRC/BDY/bdyice_lim.F90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90

@@ -8 +8 @@
    !!              -   !  2012-01 (C. Rousset)  add lim3 and remove useless jk loop 
    !!----------------------------------------------------------------------
-#if defined   key_bdy   &&  ( defined key_lim2 || defined key_lim3 )
-   !!----------------------------------------------------------------------
-   !!   'key_bdy'            and                 Unstructured Open Boundary Conditions
+#if defined key_lim2 || defined key_lim3
+   !!----------------------------------------------------------------------
    !!   'key_lim2'                                                 LIM-2 sea ice model
    !!   'key_lim3'                                                 LIM-3 sea ice model
@@ -27 +26 @@
 #elif defined key_lim3
    USE ice             ! LIM_3 ice variables
-   USE dom_ice         ! sea-ice domain
    USE limvar
+   USE limctl
 #endif 
    USE par_oce         ! ocean parameters
@@ -82 +81 @@
       !
 #if defined key_lim3
-      CALL lim_var_zapsmall
-      CALL lim_var_agg(1)
+                        CALL lim_var_zapsmall
+                        CALL lim_var_agg(1)
+      IF( ln_limctl )   CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' )
 #endif
       !
@@ -121 +121 @@
       !
 #if defined key_lim2
-      DO jb = 1, idx%nblen(jgrd)
+      DO jb = 1, idx%nblenrim(jgrd)
          ji    = idx%nbi(jb,jgrd)
          jj    = idx%nbj(jb,jgrd)
@@ -141 +141 @@
 
       DO jl = 1, jpl
-         DO jb = 1, idx%nblen(jgrd)
+         DO jb = 1, idx%nblenrim(jgrd)
             ji    = idx%nbi(jb,jgrd)
             jj    = idx%nbj(jb,jgrd)
@@ -177 +177 @@
 
       DO jl = 1, jpl
-         DO jb = 1, idx%nblen(jgrd)
+         DO jb = 1, idx%nblenrim(jgrd)
             ji    = idx%nbi(jb,jgrd)
             jj    = idx%nbj(jb,jgrd)
@@ -236 +236 @@
             END SELECT
             !
-            IF( nn_icesal == 1 ) THEN     ! constant salinity : overwrite rn_ice_sal
+            IF( nn_icesal == 1 ) THEN     ! constant salinity : overwrite rn_icesal
                sm_i(ji,jj  ,jl) = rn_icesal
                s_i (ji,jj,:,jl) = rn_icesal
@@ -325 +325 @@
             CASE ( 'U' )  
                jgrd = 2      ! u velocity
-               DO jb = 1, idx_bdy(ib_bdy)%nblen(jgrd)
+               DO jb = 1, idx_bdy(ib_bdy)%nblenrim(jgrd)
                   ji    = idx_bdy(ib_bdy)%nbi(jb,jgrd)
                   jj    = idx_bdy(ib_bdy)%nbj(jb,jgrd)
@@ -352 +352 @@
             CASE ( 'V' )
                jgrd = 3      ! v velocity
-               DO jb = 1, idx_bdy(ib_bdy)%nblen(jgrd)
+               DO jb = 1, idx_bdy(ib_bdy)%nblenrim(jgrd)
                   ji    = idx_bdy(ib_bdy)%nbi(jb,jgrd)
                   jj    = idx_bdy(ib_bdy)%nbj(jb,jgrd)