Changeset 431 for trunk/NEMO/OFF_SRC

Timestamp:

2006-04-10T17:13:10+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_037 : CT : correct the bad initialization of namelist parameters

File:

• trunk/NEMO/OFF_SRC/dtadyn.F90 (modified) (3 diffs)

trunk/NEMO/OFF_SRC/dtadyn.F90

@@ -180 +180 @@
       ! 0. Initialization
       ! -----------------
+      IF (lfirdyn) THEN
+         !
+         ! time step MUST BE nint000
+         !
+         IF( kt .NE. nit000 ) THEN
+            IF (lwp) THEN
+               WRITE (numout,*) ' kt MUST BE EQUAL to nit000. kt=',kt,' nit000=',nit000
+            END IF
+            STOP 'dtadyn'
+         END IF
+         ! Initialize the parameters of the interpolation
+         CALL dta_dyn_init
+      ENDIF
 
       zpdtan = raass / rdt
@@ -218 +231 @@
       IF (lfirdyn) THEN
       !
-      ! time step MUST BE nint000
-      !
-         IF( kt .NE. nit000 ) THEN
-              IF (lwp) THEN
-                  WRITE (numout,*) ' kt MUST BE EQUAL to nit000. kt=',kt  &
-                     ,' nit000=',nit000
-              END IF 
-              STOP 'dtadyn'
-          END if
-      ! Initialize the parameters of the interpolation
-      CALL dta_dyn_init
-      !
       ! store the information of the period read
       !
@@ -270 +271 @@
             WRITE(numout,*) '  level = ',jpkm1
             CALL prihre(tn(1,1,jpkm1),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout) 
-            WRITE(numout,*)
-            WRITE(numout,*)' salinity '
-            WRITE(numout,*)
-            CALL prihre(sn(1,1,1),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpk/2
-            CALL prihre(sn(1,1,jpk/2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpkm1
-            CALL prihre(sn(1,1,jpkm1),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*)' Kz '
-            WRITE(numout,*)
-            CALL prihre(avtdta(1,1,1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpk/2
-            CALL prihre(avtdta(1,1,jpk/2,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpkm1
-            CALL prihre(avtdta(1,1,jpkm1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*)' zonal wind '
-            WRITE(numout,*)
-            CALL prihre(udta(1,1,1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpk/2
-            CALL prihre(udta(1,1,jpk/2,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpkm1
-            CALL prihre(udta(1,1,jpkm1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*)' meridional wind '
-            WRITE(numout,*)
-            CALL prihre(vdta(1,1,1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpk/2
-            CALL prihre(vdta(1,1,jpk/2,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpkm1
-            CALL prihre(vdta(1,1,jpkm1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*)' vertical volocity '
-            WRITE(numout,*)
-            CALL prihre(wdta(1,1,1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpk/2
-            CALL prihre(wdta(1,1,jpk/2,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*) '  level = ',jpkm1
-            CALL prihre(wdta(1,1,jpkm1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*)' Wind '
-            CALL prihre(flxdta(1,1,jpwind,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-#if defined key_trcbbl_dif   ||   defined key_trcbbl_adv
-            WRITE(numout,*)
-            WRITE(numout,*)' BBL zonal'
-            CALL prihre(bblxdta(1,1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-            WRITE(numout,*)
-            WRITE(numout,*)' BBL meridional'
-            CALL prihre(bblydta(1,1,2),jpi,jpj,1,jpi,10,1,jpj,10,1.,numout)
-
-#endif
-
         ENDIF