Changeset 5168 for branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2015-03-25T10:01:32+01:00 (9 years ago)

Author:

pabouttier

Message:

Fixed several bugs described in Ticket #1360

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (4 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -77 +77 @@
 #endif
    USE tamtrj          ! Output trajectory, needed for TAM
+   USE asminc
 
    IMPLICIT NONE
@@ -110 +111 @@
       !!              Madec, 2008, internal report, IPSL.
       !!----------------------------------------------------------------------
-      INTEGER ::   istp       ! time step index
+      INTEGER ::   istp, jk      ! time step index
       !!----------------------------------------------------------------------
       !
@@ -155 +156 @@
             CALL Agrif_Step( stp )           ! AGRIF: time stepping
 #else
+            !-------------------------------------------------------------!
+            ! This trick ensures a minimum consistency between mixing coef.
+            ! and other variables
+            IF( lk_zdftke .AND. lk_asminc .AND. ln_asmdin .AND. ( istp == nit000) ) THEN
+            CALL tke_avn                        ! recompute avt, avm,
+                                                ! avmu, avmv and dissl (approximation)
+               DO jk = nit000, nit000 + 2
+                  CALL zdf_tke( jk )   ;
+               END DO
+
+            END IF
+            !-------------------------------------------------------------!
+
             CALL stp( istp )                 ! standard time stepping
 #endif
@@ -322 +336 @@
                             CALL dyn_nept_init  ! simplified form of Neptune effect
                             CALL flush(numout)
-
+                            CALL asm_inc_rea_nam ! to fix properly neuler value
+                                                 ! in istate_init
                             CALL  istate_init   ! ocean initial state (Dynamics and tracers)