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

trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90

@@ -33 +33 @@
    USE trdtra
    USE tranxt
+   USE bdy_oce   , ONLY: ln_bdy
    USE trcbdy          ! BDY open boundaries
-   USE bdy_par, only: lk_bdy
 # if defined key_agrif
    USE agrif_top_interp
@@ -43 +43 @@
 
    PUBLIC   trc_nxt          ! routine called by step.F90
-
-   REAL(wp) ::   r2dttrc
 
    !!----------------------------------------------------------------------
@@ -99 +97 @@
       END DO
 
-      IF( lk_bdy )  CALL trc_bdy( kt )
-
-      !                                ! set time step size (Euler/Leapfrog)
-      IF( neuler == 0 .AND. kt ==  nittrc000 ) THEN  ;  r2dttrc =     rdttrc   ! at nittrc000             (Euler)
-      ELSEIF( kt <= nittrc000 + nn_dttrc )     THEN  ;  r2dttrc = 2.* rdttrc   ! at nit000 or nit000+1 (Leapfrog)
-      ENDIF
+      IF( ln_bdy )  CALL trc_bdy( kt )
 
       IF( l_trdtrc )  THEN             ! trends: store now fields before the Asselin filter application