Changeset 12443 for NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE/TDE

Timestamp:

2020-02-24T14:00:21+01:00 (4 years ago)

Author:

davestorkey

Message:

2020/KERNEL-03_Storkey_Coward_RK3_stage2: More variable renaming:
atfp -> rn_atfp (use namelist parameter everywhere)
rdtbt -> rDt_e
nn_baro -> nn_e
rn_scal_load -> rn_load
rau0 -> rho0

File:

• NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE/TDE/tide_mod.F90 (modified) (5 diffs)

NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/OCE/TDE/tide_mod.F90

@@ -64 +64 @@
    INTEGER , PUBLIC ::   nb_harmo            !: Number of active tidal components
    REAL(wp), PUBLIC ::   rn_tide_ramp_dt     !:
-   REAL(wp), PUBLIC ::   rn_scal_load        !:
+   REAL(wp), PUBLIC ::   rn_load        !:
    CHARACTER(lc), PUBLIC ::   cn_tide_load   !: 
    REAL(wp)         ::   rn_tide_gamma       ! Tidal tilt factor
@@ -124 +124 @@
       NAMELIST/nam_tide/ln_tide, nn_tide_var, ln_tide_dia, ln_tide_pot, rn_tide_gamma, &
          &              ln_scal_load, ln_read_load, cn_tide_load,         &
-         &              ln_tide_ramp, rn_scal_load, rn_tide_ramp_dt,      &
+         &              ln_tide_ramp, rn_load, rn_tide_ramp_dt,      &
          &              sn_tide_cnames
       !!----------------------------------------------------------------------
@@ -153 +153 @@
             WRITE(numout,*) '         Read load potential from file           ln_read_load    = ', ln_read_load
             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,*) '         Fraction of SSH used in scal. approx.   rn_load    = ', rn_load
             WRITE(numout,*) '         Duration (days) of ramp                 rn_tide_ramp_dt = ', rn_tide_ramp_dt
          ENDIF
       ELSE
-         rn_scal_load = 0._wp 
+         rn_load = 0._wp 
 
          IF(lwp) WRITE(numout,*)
@@ -193 +193 @@
       IF( nb_harmo == 0 )   CALL ctl_stop( 'tide_init : No tidal components set in nam_tide' )
       !
-      IF (.NOT.ln_scal_load ) rn_scal_load = 0._wp
+      IF (.NOT.ln_scal_load ) rn_load = 0._wp
       !
       ALLOCATE( amp_pot(jpi,jpj,nb_harmo),                      &
@@ -754 +754 @@
       !
       IF( ln_tide_dia ) THEN          ! Output total tidal potential (incl. load potential)
-         IF ( iom_use( "tide_pot" ) ) CALL iom_put( "tide_pot", pot_astro(:,:) + rn_scal_load * ssh(:,:,Kmm) )
+         IF ( iom_use( "tide_pot" ) ) CALL iom_put( "tide_pot", pot_astro(:,:) + rn_load * ssh(:,:,Kmm) )
       END IF
       !