Changeset 7646 for trunk/NEMOGCM/NEMO/TOP_SRC/trcsub.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/TOP_SRC/trcsub.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -20 +20 @@
    USE domvvl
    USE divhor          ! horizontal divergence            (div_hor routine)
-   USE sbcrnf, ONLY: h_rnf, nk_rnf   ! River runoff 
-   USE bdy_oce
+   USE sbcrnf    , ONLY: h_rnf, nk_rnf    ! River runoff
+   USE bdy_oce   , ONLY: ln_bdy, bdytmask ! BDY
 #if defined key_agrif
    USE agrif_opa_update
@@ -493 +493 @@
       z1_rau0 = 0.5 / rau0
       ssha(:,:) = (  sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1)
-#if ! defined key_dynspg_ts
+
+      IF( .NOT.ln_dynspg_ts ) THEN
       ! These lines are not necessary with time splitting since
       ! boundary condition on sea level is set during ts loop
@@ -499 +500 @@
       CALL agrif_ssh( kt )
 #endif
-#if defined key_bdy
-      ssha(:,:) = ssha(:,:) * bdytmask(:,:)
-      CALL lbc_lnk( ssha, 'T', 1. ) 
-#endif
-#endif
+         IF( ln_bdy ) THEN
+            ssha(:,:) = ssha(:,:) * bdytmask(:,:)
+            CALL lbc_lnk( ssha, 'T', 1. ) 
+         ENDIF
+      ENDIF
       !
       !                                           !------------------------------!
@@ -514 +515 @@
             &                      - ( e3t_a(:,:,jk) - e3t_b(:,:,jk) )    &
             &                         * tmask(:,:,jk) * z1_2dt
-#if defined key_bdy
-         wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
-#endif
+         IF( ln_bdy ) wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
       END DO
       !