New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10800 – NEMO

Changeset 10800


Ignore:
Timestamp:
2019-03-25T18:19:23+01:00 (5 years ago)
Author:
smueller
Message:

Renaming of two items of namelist nam_tide to bring them in line with the namelist naming convention (ticket #2194)

Location:
NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/BDY/bdytides.F90

    r10772 r10800  
    332332      ! Linear ramp on tidal component at open boundaries  
    333333      zramp = 1._wp 
    334       IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg + (kt_tide-nit000)*rdt)/(rdttideramp*rday),0._wp),1._wp) 
     334      IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg + (kt_tide-nit000)*rdt)/(rn_tide_ramp_dt*rday),0._wp),1._wp) 
    335335 
    336336      DO itide = 1, nb_harmo 
     
    399399      ! Linear ramp on tidal component at open boundaries  
    400400      zramp = 1. 
    401       IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg - nit000*rdt)/(rdttideramp*rday),0.),1.) 
     401      IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg - nit000*rdt)/(rn_tide_ramp_dt*rday),0.),1.) 
    402402 
    403403      DO ib_bdy = 1,nb_bdy 
  • NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/TDE/tide_mod.F90

    r10793 r10800  
    5151   INTEGER , PUBLIC ::   nb_harmo        !: 
    5252   INTEGER , PUBLIC ::   kt_tide         !: 
    53    REAL(wp), PUBLIC ::   rdttideramp     !: 
     53   REAL(wp), PUBLIC ::   rn_tide_ramp_dt     !: 
    5454   REAL(wp), PUBLIC ::   rn_scal_load    !: 
    5555   CHARACTER(lc), PUBLIC ::   cn_tide_load   !:  
     
    7979      !!----------------------------------------------------------------------       
    8080      INTEGER  :: ji, jk 
    81       CHARACTER(LEN=4), DIMENSION(jpmax_harmo) :: clname 
     81      CHARACTER(LEN=4), DIMENSION(jpmax_harmo) :: sn_tide_cnames 
    8282      INTEGER  ::   ios                 ! Local integer output status for namelist read 
    8383      ! 
    8484      NAMELIST/nam_tide/ln_tide, ln_tide_pot, rn_tide_gamma, ln_scal_load, ln_read_load, cn_tide_load, & 
    85                   &     ln_tide_ramp, rn_scal_load, rdttideramp, clname 
     85                  &     ln_tide_ramp, rn_scal_load, rn_tide_ramp_dt, sn_tide_cnames 
    8686      !!---------------------------------------------------------------------- 
    8787      ! 
     
    102102            WRITE(numout,*) '~~~~~~~~~ ' 
    103103            WRITE(numout,*) '   Namelist nam_tide' 
    104             WRITE(numout,*) '      Use tidal components                       ln_tide      = ', ln_tide 
    105             WRITE(numout,*) '         Apply astronomical potential            ln_tide_pot  = ', ln_tide_pot 
    106             WRITE(numout,*) '         Tidal tilt factor                       rn_tide_gamma= ', rn_tide_gamma 
    107             WRITE(numout,*) '         Use scalar approx. for load potential   ln_scal_load = ', ln_scal_load 
    108             WRITE(numout,*) '         Read load potential from file           ln_read_load = ', ln_read_load 
    109             WRITE(numout,*) '         Apply ramp on tides at startup          ln_tide_ramp = ', ln_tide_ramp 
    110             WRITE(numout,*) '         Fraction of SSH used in scal. approx.   rn_scal_load = ', rn_scal_load 
    111             WRITE(numout,*) '         Duration (days) of ramp                 rdttideramp  = ', rdttideramp 
     104            WRITE(numout,*) '      Use tidal components                       ln_tide         = ', ln_tide 
     105            WRITE(numout,*) '         Apply astronomical potential            ln_tide_pot     = ', ln_tide_pot 
     106            WRITE(numout,*) '         Tidal tilt factor                       rn_tide_gamma   = ', rn_tide_gamma 
     107            WRITE(numout,*) '         Use scalar approx. for load potential   ln_scal_load    = ', ln_scal_load 
     108            WRITE(numout,*) '         Read load potential from file           ln_read_load    = ', ln_read_load 
     109            WRITE(numout,*) '         Apply ramp on tides at startup          ln_tide_ramp    = ', ln_tide_ramp 
     110            WRITE(numout,*) '         Fraction of SSH used in scal. approx.   rn_scal_load    = ', rn_scal_load 
     111            WRITE(numout,*) '         Duration (days) of ramp                 rn_tide_ramp_dt = ', rn_tide_ramp_dt 
    112112         ENDIF 
    113113      ELSE 
     
    125125      DO jk = 1, jpmax_harmo 
    126126         DO ji = 1,jpmax_harmo 
    127             IF( TRIM(clname(jk)) == Wave(ji)%cname_tide )   nb_harmo = nb_harmo + 1 
     127            IF( TRIM(sn_tide_cnames(jk)) == Wave(ji)%cname_tide )   nb_harmo = nb_harmo + 1 
    128128         END DO 
    129129      END DO 
     
    138138      IF( ln_scal_load.AND.ln_read_load ) & 
    139139          &   CALL ctl_stop('Choose between ln_scal_load and ln_read_load') 
    140       IF( ln_tide_ramp.AND.((nitend-nit000+1)*rdt/rday < rdttideramp) )   & 
    141          &   CALL ctl_stop('rdttideramp must be lower than run duration') 
    142       IF( ln_tide_ramp.AND.(rdttideramp<0.) ) & 
    143          &   CALL ctl_stop('rdttideramp must be positive') 
     140      IF( ln_tide_ramp.AND.((nitend-nit000+1)*rdt/rday < rn_tide_ramp_dt) )   & 
     141         &   CALL ctl_stop('rn_tide_ramp_dt must be lower than run duration') 
     142      IF( ln_tide_ramp.AND.(rn_tide_ramp_dt<0.) ) & 
     143         &   CALL ctl_stop('rn_tide_ramp_dt must be positive') 
    144144      ! 
    145145      ALLOCATE( ntide(nb_harmo) ) 
    146146      DO jk = 1, nb_harmo 
    147147         DO ji = 1, jpmax_harmo 
    148             IF( TRIM(clname(jk)) == Wave(ji)%cname_tide ) THEN 
     148            IF( TRIM(sn_tide_cnames(jk)) == Wave(ji)%cname_tide ) THEN 
    149149               ntide(jk) = ji 
    150150               EXIT 
     
    649649         zt = ( kt - nit000 ) * rdt 
    650650         IF( PRESENT( kit ) )   zt = zt + ( kit + joffset -1) * rdt / REAL( nn_baro, wp ) 
    651          zramp = MIN(  MAX( zt / (rdttideramp*rday) , 0._wp ) , 1._wp  ) 
     651         zramp = MIN(  MAX( zt / (rn_tide_ramp_dt*rday) , 0._wp ) , 1._wp  ) 
    652652         pot_astro(:,:) = zramp * pot_astro(:,:) 
    653653      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.