Changeset 8914

Timestamp:

2017-12-06T12:24:54+01:00 (6 years ago)

Author:

jchanut

Message:

ENHANCE-14_Jerome_SAL - Correct namelist parameter check - update nam_tide in DOC folder - #1926

Location:

branches/2017/dev_r8329_ENHANCE14_SAL

Files:

• DOC/Namelists/nam_tide (modified) (1 diff)
• NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 (modified) (5 diffs)

branches/2017/dev_r8329_ENHANCE14_SAL/DOC/Namelists/nam_tide

@@ -2 +2 @@
 &nam_tide      !   tide parameters
 !-----------------------------------------------------------------------
-   ln_tide       = .true.   !  Activate tide module
-   ln_tide_pot   = .true.   !  use tidal potential forcing
-   ln_tide_ramp  = .false.  !
-   rdttideramp   =    0.    !
-   clname(1)     = 'DUMMY'  !  name of constituent - all tidal components must be set in namelist_cfg
+   ln_tide       = .false.                ! Activate tides
+      ln_tide_pot   = .true.                !  use tidal potential forcing
+         ln_scal_load  = .false.               ! Use scalar approximation for
+            rn_scal_load = 0.094               !     load potential
+         ln_read_load  = .false.               ! Or read load potential from file
+            cn_tide_load = 'tide_LOAD_grid_T.nc'  ! filename for load potential
+            !
+      ln_tide_ramp  = .false.               !  Use linear ramp for tides at startup
+         rdttideramp   =    0.                 !  ramp duration in days
+      clname(1)     = 'DUMMY'               !  name of constituent - all tidal components must be set in namelist_cfg
 /

branches/2017/dev_r8329_ENHANCE14_SAL/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90

@@ -8 +8 @@
    USE oce            ! ocean dynamics and tracers variables
    USE dom_oce        ! ocean space and time domain
-   USE phycst         ! physical constant
-   USE daymod         ! calandar
+   USE phycst         ! physical constants
+   USE daymod         ! calendar
    USE tide_mod       ! 
    !
@@ -34 +34 @@
    REAL(wp), PUBLIC ::   rdttideramp     !:
    REAL(wp), PUBLIC ::   rn_scal_load    !:
-   CHARACTER(lc), PUBLIC ::   cn_tide_load   !: filename for input load potential    
+   CHARACTER(lc), PUBLIC ::   cn_tide_load   !: 
 
    INTEGER , PUBLIC, ALLOCATABLE, DIMENSION(:) ::   ntide   !:
@@ -53 +53 @@
       INTEGER  ::   ios                 ! Local integer output status for namelist read
       !
-      NAMELIST/nam_tide/ln_tide, ln_tide_pot, ln_read_load, ln_scal_load, cn_tide_load, &
+      NAMELIST/nam_tide/ln_tide, ln_tide_pot, ln_scal_load, ln_read_load, cn_tide_load, &
                   &     ln_tide_ramp, rn_scal_load, rdttideramp, clname
       !!----------------------------------------------------------------------
@@ -77 +77 @@
             WRITE(numout,*) '      Use scalar approx. for load potential : ln_scal_load = ', ln_scal_load
             WRITE(numout,*) '      Read load potential from file         : ln_read_load = ', ln_read_load
-
-            WRITE(numout,*) '                                              nb_harmo     = ', nb_harmo
-            WRITE(numout,*) '                                              rn_scal_load = ', rn_scal_load
-            WRITE(numout,*) '                                              ln_tide_ramp = ', ln_tide_ramp
-            WRITE(numout,*) '                                              rdttideramp  = ', rdttideramp
+            WRITE(numout,*) '      Apply ramp on tides at startup        : ln_tide_ramp = ', ln_tide_ramp
+            WRITE(numout,*) '      Fraction of SSH used in scal. approx. : rn_scal_load = ', rn_scal_load
+            WRITE(numout,*) '      Duration (days) of ramp               : rdttideramp  = ', rdttideramp
          ENDIF
       ELSE
@@ -106 +104 @@
       IF( ln_scal_load.AND.(.NOT.ln_tide_pot) ) &
           &   CALL ctl_stop('ln_scal_load requires ln_tide_pot')
-      IF( ln_scal_load.AND.ln_tide_pot ) &
+      IF( ln_scal_load.AND.ln_read_load ) &
           &   CALL ctl_stop('Choose between ln_scal_load and ln_read_load')
       IF( ln_tide_ramp.AND.((nitend-nit000+1)*rdt/rday < rdttideramp) )   &