Changeset 2338 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

Timestamp:

2010-10-29T10:45:18+02:00 (13 years ago)

Author:

rblod

Message:

Fix pb with vvl and time splitting, see ticket #748

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90 (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -19 +19 @@
    USE dynspg_ts      ! surface pressure gradient     (dyn_spg_ts  routine)
    USE dynspg_flt     ! surface pressure gradient     (dyn_spg_flt routine)
+   USE dynadv          ! dynamics: vector invariant versus flux form
    USE trdmod         ! ocean dynamics trends
    USE trdmod_oce     ! ocean variables trends
@@ -167 +168 @@
       ENDIF
 
+      !                        ! Control of momentum forulation
+      IF( lk_dynspg_ts .AND. lk_vvl ) THEN
+         IF( .NOT. ln_dynadv_vec )   &
+           &   CALL ctl_stop( ' Flux formulae not implemented for this free surface formulation ' )
+      ENDIF
+
 #if defined key_obc
       !                        ! Conservation of ocean volume (key_dynspg_flt)