Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.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/ZDF/zdfbfr.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -99 +99 @@
       !
       IF( nn_timing == 1 )  CALL timing_start('zdf_bfr')
-      !
-      IF( kt == nit000 .AND. lwp ) THEN
-         WRITE(numout,*)
-         WRITE(numout,*) 'zdf_bfr : Set bottom friction coefficient (non-linear case)'
-         WRITE(numout,*) '~~~~~~~~'
-      ENDIF
       !
       IF( nn_bfr == 2 ) THEN                 ! quadratic bottom friction only
@@ -259 +253 @@
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'zdf_bfr_init : momentum bottom friction'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~'
+      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
       IF(lwp) WRITE(numout,*) '   Namelist nam_bfr : set bottom friction parameters'
       !
@@ -266 +260 @@
       CASE( 0 )
          IF(lwp) WRITE(numout,*) '      free-slip '
-         bfrua(:,:) = 0.e0
-         bfrva(:,:) = 0.e0
-         tfrua(:,:) = 0.e0
-         tfrva(:,:) = 0.e0
+         bfrua(:,:) = 0._wp
+         bfrva(:,:) = 0._wp
+         tfrua(:,:) = 0._wp
+         tfrva(:,:) = 0._wp
          !
       CASE( 1 )
@@ -321 +315 @@
          IF(lwp) WRITE(numout,*) '      log formulation   ln_bfr2d = ', ln_loglayer
          IF(lwp) WRITE(numout,*) '      bottom roughness  rn_bfrz0 [m] = ', rn_bfrz0
-         IF( rn_bfrz0<=0.e0 ) THEN
+         IF( rn_bfrz0 <= 0._wp ) THEN
             WRITE(ctmp1,*) '      bottom roughness must be strictly positive'
             CALL ctl_stop( ctmp1 )
@@ -336 +330 @@
             IF(lwp) WRITE(numout,*) '      log formulation   ln_tfr2d     = ', ln_loglayer
             IF(lwp) WRITE(numout,*) '      top roughness     rn_tfrz0 [m] = ', rn_tfrz0
-            IF( rn_tfrz0<=0.e0 ) THEN
+            IF( rn_tfrz0 <= 0._wp ) THEN
                WRITE(ctmp1,*) '      top roughness must be strictly positive'
                CALL ctl_stop( ctmp1 )