Changeset 4488 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90

Timestamp:

2014-02-06T11:43:09+01:00 (10 years ago)

Author:

rfurner

Message:

fixes to enable proper calulation of slopes for geopotential diffusion in scoords

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90 (modified) (2 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90

@@ -20 +20 @@
    USE dynldf_iso     ! lateral mixing            (dyn_ldf_iso    routine)
    USE dynldf_lap     ! lateral mixing            (dyn_ldf_lap    routine)
+   USE ldftra_oce, ONLY: ln_traldf_hor     ! ocean tracers lateral physics
    USE trdmod         ! ocean dynamics and tracer trends
    USE trdmod_oce     ! ocean variables trends
@@ -152 +153 @@
       IF( ioptio >  1 ) CALL ctl_stop( '          use only ONE direction (level/hor/iso)' )
 
+      IF( ln_dynldf_iso .AND. ln_traldf_hor ) CALL ctl_stop( 'Not sensible to use geopotential diffusion for tracers with isoneutral diffusion for dynamics' )
+
       !                                   ! Set nldf, the type of lateral diffusion, from ln_dynldf_... logicals
       ierr = 0