Changeset 3583 for branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2012-11-16T17:18:17+01:00 (11 years ago)

Author:

cbricaud

Message:

add modification from dev_r3327_MERCATOR1_BDY branch in dev_MERCATOR_2012_rev3555 branch

File:

• branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (4 diffs)

branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -403 +403 @@
          IF( lk_obc )   CALL obc_dta_bt ( kt, jn   )
          IF( lk_bdy )   CALL bdy_dta ( kt, jit=jn, time_offset=+1 )
-         IF ( ln_tide_pot ) CALL upd_tide( kt, jn )
+         IF ( ln_tide_pot .AND. lk_tide) CALL upd_tide( kt, jn )
 
          !                                                !* after ssh_e
@@ -453 +453 @@
                   ENDIF
                   ! add tidal astronomical forcing
-                  IF ( ln_tide_pot ) THEN 
+                  IF ( ln_tide_pot .AND. lk_tide ) 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)
@@ -503 +503 @@
                   ENDIF
                   ! add tidal astronomical forcing
-                  IF ( ln_tide_pot ) THEN
+                  IF ( ln_tide_pot .AND. lk_tide ) 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)
@@ -550 +550 @@
                   ENDIF
                   ! add tidal astronomical forcing
-                  IF ( ln_tide_pot ) THEN
+                  IF ( ln_tide_pot .AND. lk_tide ) 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)