Changeset 7646 for trunk/NEMOGCM/TOOLS/SIREN/src/vgrid.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/TOOLS/SIREN/src/vgrid.f90 (modified) (9 diffs)

trunk/NEMOGCM/TOOLS/SIREN/src/vgrid.f90

@@ -14 +14 @@
 !>    CALL vgrid_zgr_z(dd_gdepw(:), dd_gdept(:), dd_e3w(:), dd_e3t(:), 
 !>                     dd_ppkth, dd_ppkth2, dd_ppacr, dd_ppacr2, 
-!>                     dd_ppdzmin, dd_pphmax, dd_pp_to_be_computed, 
+!>                     dd_ppdzmin, dd_pphmax, 
 !>                     dd_ppa0, dd_ppa1, dd_ppa2, dd_ppsur)
 !> @endcode
@@ -26 +26 @@
 !>       - dd_ppdzmin            see NEMO documentation
 !>       - dd_pphmax             see NEMO documentation
-!>       - dd_pp_to_be_computed  see NEMO documentation
 !>       - dd_ppa1               see NEMO documentation
 !>       - dd_ppa2               see NEMO documentation
@@ -133 +132 @@
    !> @param[in] dd_ppdzmin
    !> @param[in] dd_pphmax 
-   !> @param[in] dd_pp_to_be_computed
    !> @param[in] dd_ppa1
    !> @param[in] dd_ppa2 
@@ -140 +138 @@
    !-------------------------------------------------------------------
    SUBROUTINE vgrid_zgr_z( dd_gdepw, dd_gdept, dd_e3w, dd_e3t,          &
-   &                       dd_e3w_1d, dd_e3t_1d, &
+   &                       dd_e3w_1d, dd_e3t_1d,                        &
    &                       dd_ppkth, dd_ppkth2, dd_ppacr, dd_ppacr2,    &
-   &                       dd_ppdzmin, dd_pphmax, dd_pp_to_be_computed, &
+   &                       dd_ppdzmin, dd_pphmax,                       &
    &                       dd_ppa0, dd_ppa1, dd_ppa2, dd_ppsur )
       IMPLICIT NONE
@@ -160 +158 @@
       REAL(dp)              , INTENT(IN   ) :: dd_ppdzmin
       REAL(dp)              , INTENT(IN   ) :: dd_pphmax
-      REAL(dp)              , INTENT(IN   ) :: dd_pp_to_be_computed
+      REAL(dp), PARAMETER                   :: dp_pp_to_be_computed = NF90_FILL_DOUBLE
 
       REAL(dp)              , INTENT(IN   ) :: dd_ppa0
@@ -207 +205 @@
       !  za0, za1, zsur are computed from ppdzmin , pphmax, ppkth, ppacr
       !
-       IF(  dd_ppa1  == dd_pp_to_be_computed  .AND.  &
-         &  dd_ppa0  == dd_pp_to_be_computed  .AND.  &
-         &  dd_ppsur == dd_pp_to_be_computed           ) THEN
+       IF(  dd_ppa1  == dp_pp_to_be_computed  .AND.  &
+         &  dd_ppa0  == dp_pp_to_be_computed  .AND.  &
+         &  dd_ppsur == dp_pp_to_be_computed           ) THEN
          dl_za1 = ( dl_zdzmin - dl_zhmax / REAL((il_jpk-1),dp) ) &
              &     / ( TANH((1-dl_zkth)/dl_zacr) - dl_zacr/REAL((il_jpk-1),dp) &
@@ -667 +665 @@
 
       !namelist (intialise with GLORYS 75 levels parameters)
-      REAL(dp)                                :: dn_pp_to_be_computed = 0._dp
       REAL(dp)                                :: dn_ppsur     = -3958.951371276829_dp
       REAL(dp)                                :: dn_ppa0      =   103.9530096000000_dp
@@ -684 +681 @@
       !----------------------------------------------------------------
       NAMELIST /namzgr/ &
-      &  dn_pp_to_be_computed, &
       &  dn_ppsur,     &
       &  dn_ppa0,      &
@@ -788 +784 @@
       &                 dl_e3w_1d, dl_e3t_1d, &
       &                 dn_ppkth, dn_ppkth2, dn_ppacr, dn_ppacr2,       &
-      &                 dn_ppdzmin, dn_pphmax, dn_pp_to_be_computed,    &
+      &                 dn_ppdzmin, dn_pphmax, &
       &                 dn_ppa0, dn_ppa1, dn_ppa2, dn_ppsur )