Changeset 35 for trunk/NEMO/OPA_SRC/step.F90

Timestamp:

2004-02-18T12:06:07+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE002 : Concerns Open Boundaries

File:

• trunk/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/step.F90

@@ -186 +186 @@
       IF( lk_dtasst  )   CALL dta_sst( kstp )         ! Sea Surface Temperature data
 
-      IF( lk_obc     )   CALL obc_dta_psi( kstp )     ! update bsf data at open boundaries
-
-      IF( lk_obc     )   CALL obc_dta_uvt( kstp )     ! update u, v, t, s data at open boundaries
+      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
@@ -371 +369 @@
       IF( ln_dynvor_ens    )   CALL dyn_vor_enstrophy( kstp )        ! enstrophy conserving scheme
       IF( ln_dynvor_ene    )   CALL dyn_vor_energy   ( kstp )        ! energy conserving scheme
-      IF( ln_dynvor_mix    )   CALL dyn_vor_mixed    ( kstp )        ! combined scheme
+      IF( ln_dynvor_mix    )   CALL dyn_vor_mixed    ( kstp )        ! mixed energy/enstrophy conserving scheme
+      IF( ln_dynvor_een    )   CALL dyn_vor_ene_ens  ( kstp )        ! energy and enstrophy conserving scheme
 
       !                                                     ! lateral mixing