Changeset 2920 for branches/2011/dev_r2787_MERCATOR3_tidalpot

Timestamp:

2011-10-14T09:15:19+02:00 (13 years ago)

Author:

cbricaud

Message:

add tidal potential

Location:

branches/2011/dev_r2787_MERCATOR3_tidalpot/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/dynspg_ts.F90 (modified) (5 diffs)
• step.F90 (modified) (1 diff)
• step_oce.F90 (modified) (1 diff)
• tide.h90 (added)
• tide_mod.F90 (added)
• tideini.F90 (added)
• updtide.F90 (added)

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

@@ -35 +35 @@
    USE bdydyn          ! unstructured open boundaries
    USE bdytides        ! tidal forcing at unstructured open boundaries.
+   USE tideini
+   USE updtide
    USE lib_mpp         ! distributed memory computing library
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
@@ -371 +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 )
 
          !                                                !* after ssh_e
@@ -418 +421 @@
                      zu_spg = -grav * ( sshn_e(ji+1,jj) - sshn_e(ji,jj) ) / e1u(ji,jj)
                      zv_spg = -grav * ( sshn_e(ji,jj+1) - sshn_e(ji,jj) ) / e2v(ji,jj)
+                  ENDIF
+                  ! add tidal astronomical forcing
+                  IF ( 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)
                   ENDIF
                   ! energy conserving formulation for planetary vorticity term
@@ -447 +455 @@
                      zv_spg = -grav * ( sshn_e(ji,jj+1) - sshn_e(ji,jj) ) / e2v(ji,jj)
                   ENDIF
+                  ! add tidal astronomical forcing
+                  IF ( 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)
+                  ENDIF
                   ! enstrophy conserving formulation for planetary vorticity term
                   zy1 =   z1_8 * ( zwy(ji  ,jj-1) + zwy(ji+1,jj-1) + zwy(ji,jj) + zwy(ji+1,jj  ) ) / e1u(ji,jj)
@@ -472 +485 @@
                      zu_spg = -grav * ( sshn_e(ji+1,jj) - sshn_e(ji,jj) ) / e1u(ji,jj)
                      zv_spg = -grav * ( sshn_e(ji,jj+1) - sshn_e(ji,jj) ) / e2v(ji,jj)
+                  ENDIF
+                  ! add tidal astronomical forcing
+                  IF ( 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)
                   ENDIF
                   ! energy/enstrophy conserving formulation for planetary vorticity term

branches/2011/dev_r2787_MERCATOR3_tidalpot/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -97 +97 @@
       IF( lk_dtasal  )   CALL dta_sal( kstp )         ! update 3D salinity data
                          CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice)
+      IF( lk_tide    )   CALL tide_init( kstp )
       IF( lk_obc     )   CALL obc_dta( kstp )         ! update dynamic and tracer data at open boundaries
       IF( lk_obc     )   CALL obc_rad( kstp )         ! compute phase velocities at open boundaries

branches/2011/dev_r2787_MERCATOR3_tidalpot/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -23 +23 @@
    USE sbccpl           ! surface boundary condition: coupled formulation (call send at end of step)
    USE cpl_oasis3, ONLY : lk_cpl
+   USE tideini          ! Tide initialisation
 
    USE traqsr           ! solar radiation penetration      (tra_qsr routine)