Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.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/DOM/phycst.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/phycst.F90

@@ -100 +100 @@
       !!                       ***  ROUTINE phy_cst  ***
       !!
-      !! ** Purpose :   Print model parameters and set and print the constants
-      !!----------------------------------------------------------------------
-      CHARACTER (len=64) ::   cform = "(A12, 3(A13, I7) )" 
+      !! ** Purpose :   set and print the constants
       !!----------------------------------------------------------------------
 
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) ' phy_cst : initialization of ocean parameters and constants'
-      IF(lwp) WRITE(numout,*) ' ~~~~~~~'
+      IF(lwp) WRITE(numout,*) 'phy_cst : initialization of ocean parameters and constants'
+      IF(lwp) WRITE(numout,*) '~~~~~~~'
 
-      ! Ocean Parameters
-      ! ----------------
-      IF(lwp) THEN
-         WRITE(numout,*) '       Domain info'
-         WRITE(numout,*) '          dimension of model'
-         WRITE(numout,*) '                 Local domain      Global domain       Data domain '
-         WRITE(numout,cform) '            ','   jpi     : ', jpi, '   jpiglo  : ', jpiglo, '   jpidta  : ', jpidta
-         WRITE(numout,cform) '            ','   jpj     : ', jpj, '   jpjglo  : ', jpjglo, '   jpjdta  : ', jpjdta
-         WRITE(numout,cform) '            ','   jpk     : ', jpk, '   jpk     : ', jpk   , '   jpkdta  : ', jpkdta
-         WRITE(numout,*)      '           ','   jpij    : ', jpij
-         WRITE(numout,*) '          mpp local domain info (mpp)'
-         WRITE(numout,*) '             jpni    : ', jpni, '   jpreci  : ', jpreci
-         WRITE(numout,*) '             jpnj    : ', jpnj, '   jprecj  : ', jprecj
-         WRITE(numout,*) '             jpnij   : ', jpnij
-         WRITE(numout,*) '          lateral domain boundary condition type : jperio  = ', jperio
-      ENDIF
-
-      ! Define constants
-      ! ----------------
+      ! Define & print constants
+      ! ------------------------
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) '       Constants'