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

Timestamp:

2009-07-03T17:28:06+02:00 (15 years ago)

Author:

smasson

Message:

distribution of iom_put + cleaning of LIM2 outputs, see ticket:437

File:

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

trunk/NEMO/OPA_SRC/step.F90

@@ -190 +190 @@
       IF( lk_bdy     )   CALL bdy_dta( kstp )         ! update dynamic and tracer data at unstructured open boundary
 
-      IF( ninist == 1 ) THEN                       ! Output the initial state and forcings
-                        CALL dia_wri_state( 'output.init', kstp )
-                        ninist = 0
-      ENDIF
-
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       !                Ocean dynamics : ssh, wn, hdiv, rot                   !
@@ -260 +255 @@
       IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )                 ! eddy induced velocity coefficient
 #  endif
+
+      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+      ! diagnostics and outputs
+      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+                         CALL dia_wri( kstp, indic )         ! ocean model: outputs
+      IF( lk_floats  )   CALL flo_stp( kstp )                ! drifting Floats
+      IF( lk_diaspr  )   CALL dia_spr( kstp )                ! Surface pressure diagnostics
+      IF( lk_diahth  )   CALL dia_hth( kstp )                ! Thermocline depth (20 degres isotherm depth)
+      IF( lk_diagap  )   CALL dia_gap( kstp )                ! basin averaged diagnostics
+      IF( lk_diahdy  )   CALL dia_hdy( kstp )                ! dynamical heigh diagnostics
+      IF( lk_diafwb  )   CALL dia_fwb( kstp )                ! Fresh water budget diagnostics
+      IF( ln_diaptr  )   CALL dia_ptr( kstp )                ! Poleward TRansports diagnostics
 
 #if defined key_top
@@ -337 +344 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                                  CALL stp_ctl( kstp, indic )
-      IF( indic < 0          )   CALL ctl_stop( 'step: indic < 0' )
+      IF( indic < 0          )   THEN
+                                 CALL ctl_stop( 'step: indic < 0' )
+                                 CALL dia_wri_state( 'output.abort', kstp )
+      ENDIF
       IF( kstp == nit000     )   CALL iom_close( numror )             ! close input  ocean restart file
       IF( lrst_oce           )   CALL rst_write    ( kstp )           ! write output ocean restart file
@@ -343 +353 @@
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-      ! diagnostics and outputs
+      ! Trends
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       ! N.B. ua, va, ta, sa arrays are used as workspace in this section
@@ -349 +359 @@
 
       IF( nstop == 0 ) THEN                                 ! Diagnostics:
-         IF( lk_floats  )   CALL flo_stp( kstp )                 ! drifting Floats
          IF( lk_trddyn  )   CALL trd_dwr( kstp )                 ! trends: dynamics 
          IF( lk_trdtra  )   CALL trd_twr( kstp )                 ! trends: active tracers
          IF( lk_trdmld  )   CALL trd_mld( kstp )                 ! trends: Mixed-layer 
          IF( lk_trdvor  )   CALL trd_vor( kstp )                 ! trends: vorticity budget
-         IF( lk_diaspr  )   CALL dia_spr( kstp )                 ! Surface pressure diagnostics
-         IF( lk_diahth  )   CALL dia_hth( kstp )                 ! Thermocline depth (20 degres isotherm depth)
-         IF( lk_diagap  )   CALL dia_gap( kstp )                 ! basin averaged diagnostics
-         IF( lk_diahdy  )   CALL dia_hdy( kstp )                 ! dynamical heigh diagnostics
-         IF( lk_diafwb  )   CALL dia_fwb( kstp )                 ! Fresh water budget diagnostics
-         IF( ln_diaptr  )   CALL dia_ptr( kstp )                 ! Poleward TRansports diagnostics
-         !                                                 ! outputs
-                            CALL dia_wri( kstp, indic )          ! ocean model: outputs
       ENDIF