Changeset 2967 for branches/2011/dev_r2787_MERCATOR3_tidalpot/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2011-10-20T11:43:07+02:00 (13 years ago)

Author:

cbricaud

Message:

Use only ln_tide_pot to activate tidal potential forcing

File:

• branches/2011/dev_r2787_MERCATOR3_tidalpot/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (4 diffs)

branches/2011/dev_r2787_MERCATOR3_tidalpot/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -373 +373 @@
          IF( lk_obc )   CALL obc_dta_bt ( kt, jn   )
          IF( lk_bdy )   CALL bdy_dta_fla( kt, jn+1, icycle )
-         IF ((lk_tide).AND.(ln_tide_pot)) CALL upd_tide( kt, jn )
+         IF ( ln_tide_pot ) CALL upd_tide( kt, jn )
 
          !                                                !* after ssh_e
@@ -423 +423 @@
                   ENDIF
                   ! add tidal astronomical forcing
-                  IF ( lk_tide ) THEN 
+                  IF ( ln_tide_pot ) THEN 
                   zu_spg = zu_spg + grav * ( pot_astro(ji+1,jj) - pot_astro(ji,jj) ) / e1u(ji,jj)
                   zv_spg = zv_spg + grav * ( pot_astro(ji,jj+1) - pot_astro(ji,jj) ) / e2v(ji,jj)
@@ -456 +456 @@
                   ENDIF
                   ! add tidal astronomical forcing
-                  IF ( lk_tide ) THEN
+                  IF ( ln_tide_pot ) THEN
                   zu_spg = zu_spg + grav * ( pot_astro(ji+1,jj) - pot_astro(ji,jj) ) / e1u(ji,jj)
                   zv_spg = zv_spg + grav * ( pot_astro(ji,jj+1) - pot_astro(ji,jj) ) / e2v(ji,jj)
@@ -487 +487 @@
                   ENDIF
                   ! add tidal astronomical forcing
-                  IF ( lk_tide ) THEN
+                  IF ( ln_tide_pot ) THEN
                   zu_spg = zu_spg + grav * ( pot_astro(ji+1,jj) - pot_astro(ji,jj) ) / e1u(ji,jj)
                   zv_spg = zv_spg + grav * ( pot_astro(ji,jj+1) - pot_astro(ji,jj) ) / e2v(ji,jj)