Changeset 9210 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2018-01-11T16:41:21+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: merge a 4th mpp_max (stop, see WP2017/HPC03) cleaning in nemo_gcm routine

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -280 +280 @@
       IF(.NOT.ln_linssh) CALL dom_vvl_sf_swp( kstp )  ! swap of vertical scale factors
       !
-      IF( ln_diahsb        )   CALL dia_hsb( kstp )         ! - ML - global conservation diagnostics
+      IF( ln_diahsb  )   CALL dia_hsb       ( kstp )  ! - ML - global conservation diagnostics
 
 !!gm : This does not only concern the dynamics ==>>> add a new title
@@ -287 +287 @@
 !!jc: That would be better, but see comment above
 !!
-      IF( lrst_oce         )   CALL rst_write    ( kstp )   ! write output ocean restart file
-      IF( ln_sto_eos       )   CALL sto_rst_write( kstp )   ! write restart file for stochastic parameters
+      IF( lrst_oce   )   CALL rst_write    ( kstp )   ! write output ocean restart file
+      IF( ln_sto_eos )   CALL sto_rst_write( kstp )   ! write restart file for stochastic parameters
 
 #if defined key_agrif
@@ -298 +298 @@
       IF( Agrif_NbStepint() == 0 ) THEN               ! AGRIF Update 
 !!jc in fact update is useless at last time step, but do it for global diagnostics
-                             CALL Agrif_Update_ssh()      ! Update ssh
-         IF(.NOT.ln_linssh)  CALL Agrif_Update_vvl()      ! Update vertical scale factors  
-                             CALL Agrif_Update_Tra()      ! Update active tracers
-                             CALL Agrif_Update_Dyn()      ! Update momentum
-#if defined key_top
-                             CALL Agrif_Update_Trc()      ! Update passive tracers
-#endif
-      ENDIF
-#endif
-      IF( ln_diaobs  )   CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics (call after dynamics update)
+                              CALL Agrif_Update_ssh()    ! Update ssh
+         IF(.NOT.ln_linssh)   CALL Agrif_Update_vvl()    ! Update vertical scale factors  
+                              CALL Agrif_Update_Tra()    ! Update active tracers
+                              CALL Agrif_Update_Dyn()    ! Update momentum
+# if defined key_top
+                              CALL Agrif_Update_Trc()    ! Update passive tracers
+# endif
+      ENDIF
+#endif
+      IF( ln_diaobs  )   CALL dia_obs      ( kstp )      ! obs-minus-model (assimilation) diagnostics (call after dynamics update)
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Control
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-                         CALL stp_ctl       ( kstp, indic )
-      IF( indic < 0  ) THEN
-                         CALL ctl_stop( 'step: indic < 0' )
-                         CALL dia_wri_state( 'output.abort', kstp )
-      ENDIF
-      IF( kstp == nit000 ) THEN
-                 CALL iom_close( numror )     ! close input  ocean restart file
-         IF(lwm) CALL FLUSH    ( numond )     ! flush output namelist oce
-         IF(lwm.AND.numoni /= -1 )   &
-            &    CALL FLUSH    ( numoni )     ! flush output namelist ice (if exist)
+                         CALL stp_ctl      ( kstp, indic )
+                         
+      IF( kstp == nit000 ) THEN                          ! 1st time step only
+                                        CALL iom_close( numror )   ! close input  ocean restart file
+         IF(lwm)                        CALL FLUSH    ( numond )   ! flush output namelist oce
+         IF(lwm .AND. numoni /= -1 )    CALL FLUSH    ( numoni )   ! flush output namelist ice (if exist)
       ENDIF
 
@@ -337 +333 @@
 #endif
       !
-      IF( ln_timing ) THEN
-         IF( ln_timing      )   CALL timing_start('stp')
-!!gm avoid the init phase during 1st time step ???  useless now no?
-         IF( kstp == nit000 )   CALL timing_reset           
-      ENDIF
+      IF( ln_timing )   CALL timing_stop('stp')
       !
    END SUBROUTINE stp