Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.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/SBC/sbctide.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90

@@ -22 +22 @@
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) ::   pot_astro   !
 
-#if defined key_tide
    !!----------------------------------------------------------------------
-   !!   'key_tide' :                                        tidal potential
+   !!   tidal potential
    !!----------------------------------------------------------------------
    !!   sbc_tide            : 
@@ -30 +29 @@
    !!----------------------------------------------------------------------
 
-   LOGICAL, PUBLIC, PARAMETER ::   lk_tide  = .TRUE.
    REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   amp_pot, phi_pot
 
@@ -125 +123 @@
    END SUBROUTINE tide_init_potential
 
-#else
-  !!----------------------------------------------------------------------
-  !!   Default case :   Empty module
-  !!----------------------------------------------------------------------
-  LOGICAL, PUBLIC, PARAMETER ::   lk_tide = .FALSE.
-CONTAINS
-  SUBROUTINE sbc_tide( kt )      ! Empty routine
-    INTEGER         , INTENT(in) ::   kt         ! ocean time-step
-    WRITE(*,*) 'sbc_tide: You should not have seen this print! error?', kt
-  END SUBROUTINE sbc_tide
-#endif
-
   !!======================================================================
 END MODULE sbctide