Changeset 8017

Timestamp:

2017-05-10T16:34:42+02:00 (6 years ago)

Author:

flavoni

Message:

add missing key iomput for GYRE_PISCES, and add needed values for ISOMIP when compiler checking bound activated

Location:

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/CONFIG

Files:

• GYRE_PISCES/cpp_GYRE_PISCES.fcm (modified) (1 diff)
• TEST_CASES/ISOMIP/EXP00/namelist_cfg (modified) (1 diff)
• TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90 (modified) (2 diffs)
• TEST_CASES/ISOMIP/MY_SRC/usrdef_zgr.F90 (modified) (1 diff)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/CONFIG/GYRE_PISCES/cpp_GYRE_PISCES.fcm

@@ -1 @@
-bld::tool::fppkeys   key_top key_mpp_mpi key_nosignedzero
+bld::tool::fppkeys key_top key_mpp_mpi key_nosignedzero key_iomput

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg

@@ -5 +5 @@
 &namusr_def    !   ISOMIP user defined namelist  
 !-----------------------------------------------------------------------
-   ln_zco      = .false.      ! z-coordinate
    ln_zps      = .true.       ! z-partial-step coordinate
-   ln_sco      = .false.      ! s-coordinate
    rn_lam0     =   0.0        !  longitude of first raw and column T-point (jphgr_msh = 1)
    rn_phi0     = -80.0        ! latitude  of first raw and column T-point (jphgr_msh = 1)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_hgr.F90

@@ -94 +94 @@
             pphiv(ji,jj) = rn_phi0 + rn_e2deg * zvj
             pphif(ji,jj) = rn_phi0 + rn_e2deg * zfj
+     !                       !==  Horizontal scale factors  ==!   (in meters) 
      ! e1
             pe1t(ji,jj) = ra * rad * COS( rad * pphit(ji,jj) ) * rn_e1deg
@@ -106 +107 @@
          END DO
       END DO
+      !                             ! NO reduction of grid size in some straits 
+      ke1e2u_v = 0                  !    ==>> u_ & v_surfaces will be computed in dom_ghr routine
+      pe1e2u(:,:) = 0._wp           !    CAUTION: set to zero to avoid error with some compilers that
+      pe1e2v(:,:) = 0._wp           !             require an initialization of INTENT(out) arguments
       !
-      kff = 0 ! Coriolis parameter calculated on the sphere
+      !
+      !                       !==  Coriolis parameter  ==!
+      kff = 0                       ! Coriolis parameter calculated on the sphere
+      !
+      !
+      pff_f(:,:) = 0._wp            ! CAUTION: set to zero to avoid error with some compilers that
+      pff_t(:,:) = 0._wp            !             require an initialization of INTENT(out) arguments
       !
       IF( nn_timing == 1 )  CALL timing_stop('usr_def_hgr')

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/MY_SRC/usrdef_zgr.F90

@@ -80 +80 @@
       ! type of vertical coordinate
       ! ---------------------------
-      ! already set in usrdef_nam.F90 by reading the namusr_def namelist except for ISF
-      ld_isfcav = .TRUE.
+      ! set in usrdef_nam.F90 by reading the namusr_def namelist except for ISF
+      ln_zco    = .FALSE.      ! z-partial-step coordinate
+      ln_zps    = .TRUE.       ! z-partial-step coordinate
+      ln_sco    = .FALSE.      ! s-coordinate
+      ld_isfcav = .TRUE.       ! ISF Ice Shelves Flag
       !
       !