Changeset 5770 for branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2015-10-01T14:48:08+02:00 (9 years ago)

Author:

gm

Message:

#1593: LDF-ADV, step II.2: phasing the improvements/simplifications of advective tracer trend (see wiki page)

File:

• branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (11 diffs)

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -109 +109 @@
       IF( lk_bdy     )   CALL bdy_dta ( kstp, time_offset=+1 )   ! update dynamic & tracer data at open boundaries
                          CALL sbc     ( kstp )                   ! Sea Boundary Condition (including sea-ice)
-CALL FLUSH    ( numout )
+
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Update stochastic parameters and random T/S fluctuations
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
                          CALL sto_par( kstp )          ! Stochastic parameters
-CALL FLUSH    ( numout )
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -124 +123 @@
                          CALL bn2    ( tsb, rab_b, rn2b ) ! before Brunt-Vaisala frequency
                          CALL bn2    ( tsn, rab_n, rn2  ) ! now    Brunt-Vaisala frequency
-CALL FLUSH    ( numout )
+
       !
       !  VERTICAL PHYSICS
@@ -137 +136 @@
          avmv(:,:,:) = rn_avm0 * wvmask(:,:,:)
       ENDIF
-CALL FLUSH    ( numout )
+
       IF( ln_rnf_mouth ) THEN                         ! increase diffusivity at rivers mouths
          DO jk = 2, nkrnf   ;   avt(:,:,jk) = avt(:,:,jk) + 2._wp * rn_avt_rnf * rnfmsk(:,:) * tmask(:,:,jk)   ;   END DO
@@ -152 +151 @@
       IF( lrst_oce .AND. lk_zdftke )   CALL tke_rst( kstp, 'WRITE' )
       IF( lrst_oce .AND. lk_zdfgls )   CALL gls_rst( kstp, 'WRITE' )
-CALL FLUSH    ( numout )
       !
       !  LATERAL  PHYSICS
@@ -179 +177 @@
       !                                               ! eddy diffusivity coeff. and/or eiv coeff.
       IF( l_ldftra_time .OR. l_ldfeiv_time )   CALL ldf_tra( kstp ) 
-write(*,*) 'after ldf_slp'
-CALL FLUSH    ( numout )
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -188 +184 @@
       IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors 
                          CALL wzv           ( kstp )  ! now cross-level velocity 
-write(*,*) 'after wzv'
-CALL FLUSH    ( numout )
 
       IF( lk_dynspg_ts ) THEN 
@@ -231 +225 @@
                                   CALL wzv           ( kstp )  ! now cross-level velocity 
       ENDIF
-write(*,*) 'after wzv 2'
-CALL FLUSH    ( numout )
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -253 +245 @@
                          CALL trc_stp( kstp )         ! time-stepping
 #endif
-write(*,*) 'end dyn '
-CALL FLUSH    ( numout )
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -270 +260 @@
       IF( lk_bdy         )   CALL bdy_tra_dmp( kstp )       ! bdy damping trends
                              CALL tra_adv    ( kstp )       ! horizontal & vertical advection
-write(*,*) 'before tra_ldf'
-CALL FLUSH    ( numout )
                              CALL tra_ldf    ( kstp )       ! lateral mixing
-write(*,*) 'after tra_ldf'
-CALL FLUSH    ( numout )
 
 !!gm : why CALL to dia_ptr has been moved here??? (use trends info?)
@@ -316 +302 @@
                              CALL tra_nxt( kstp )                ! tracer fields at next time step
       ENDIF
-write(*,*) 'after tra_nxt'
-CALL FLUSH    ( numout )
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -360 +344 @@
       IF( lk_vvl           )   CALL dom_vvl_sf_swp( kstp )  ! swap of vertical scale factors
       !
-write(*,*) 'after dom_vvl'
-CALL FLUSH    ( numout )
-
 
 !!gm : This does not only concern the dynamics ==>>> add a new title