Changeset 4220 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2013-11-15T16:36:52+01:00 (11 years ago)

Author:

clem

Message:

corrections for restartability

File:

• branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (5 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -90 +90 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice)
+
       IF( lk_tide.AND.(kstp /= nit000 ))   CALL tide_init ( kstp )
       IF( lk_tide    )   CALL sbc_tide( kstp )
@@ -108 +109 @@
       !
       !  VERTICAL PHYSICS
-      ! bg jchanut tschanges
-      ! One need bottom friction parameter in ssh_wzv routine with time splitting.
-      ! The idea could be to move the call below before ssh_wzv. However, "now" scale factors
-      ! at U-V points (which are set thanks to sshu_n, sshv_n) are actually available in sshwzv.
-      ! These are needed for log bottom friction...
-#if ! defined key_dynspg_ts
                          CALL zdf_bfr( kstp )         ! bottom friction
-#endif
-      ! end jchanut tschanges
 
       !                                               ! Vertical eddy viscosity and diffusivity coefficients
@@ -214 +207 @@
             &                                          rhd, gru , grv  )      ! of t, s, rd at the last ocean level
 
-      ELSE   
-                                               ! centered hpg  (eos then time stepping)
-      ! bg jchanut tschanges
-#if ! defined key_dynspg_ts
-      ! eos already called
+      ELSE                                                  ! centered hpg  (eos then time stepping)
                              CALL eos    ( tsn, rhd, rhop )      ! now in situ density for hpg computation
          IF( ln_zps      )   CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv,  &    ! zps: now hor. derivative
             &                                          rhd, gru , grv  )      ! of t, s, rd at the last ocean level
-#endif
-      ! end jchanut tschanges
          IF( ln_zdfnpc   )   CALL tra_npc( kstp )                ! update after fields by non-penetrative convection
                              CALL tra_nxt( kstp )                ! tracer fields at next time step
@@ -231 +218 @@
       ! Dynamics                                    (tsa used as workspace)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      ! bg jchanut tschanges
-#if defined key_dynspg_ts      
-! revert to previously computed tendencies:
-! (not using ua, va as temporary arrays during tracers' update could avoid that)
-                               ua(:,:,:) = ua_bak(:,:,:)            
-                               va(:,:,:) = va_bak(:,:,:)
-                               CALL dyn_bfr( kstp )         ! bottom friction
-                               CALL dyn_zdf( kstp )         ! vertical diffusion
-#else
-      ! end jchanut tschanges
                                ua(:,:,:) = 0.e0             ! set dynamics trends to zero
                                va(:,:,:) = 0.e0
@@ -260 +237 @@
                                CALL dyn_zdf( kstp )         ! vertical diffusion
                                CALL dyn_spg( kstp, indic )  ! surface pressure gradient
-      ! bg jchanut tschanges
-#endif
-      ! end jchanut tschanges
                                CALL dyn_nxt( kstp )         ! lateral velocity at next time step