Changeset 6464 for trunk/NEMOGCM/NEMO

Timestamp:

2016-04-11T13:09:42+02:00 (8 years ago)

Author:

pabouttier

Message:

Add restarting functionality for stochastic parametrization parameters; See ticket #1705

File:

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

trunk/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -112 +112 @@
       ! Update stochastic parameters and random T/S fluctuations
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-                         CALL sto_par( kstp )          ! Stochastic parameters
+      IF( ln_sto_eos ) CALL sto_par( kstp )          ! Stochastic parameters
+      IF( ln_sto_eos ) CALL sto_pts( tsn  )          ! Random T/S fluctuations
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -154 +155 @@
       !
       IF( l_ldfslp ) THEN                             ! slope of lateral mixing
-!!gm : why this here ????
-         IF(ln_sto_eos ) CALL sto_pts( tsn )          ! Random T/S fluctuations
-!!gm
                          CALL eos( tsb, rhd, gdept_0(:,:,:) )               ! before in situ density
 
@@ -183 +181 @@
       IF(.NOT.ln_linssh )   CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors 
                             CALL wzv           ( kstp )  ! now cross-level velocity 
-!!gm : why also here ????
-      IF( ln_sto_eos    )   CALL sto_pts( tsn )                             ! Random T/S fluctuations
-!!gm
                             CALL eos    ( tsn, rhd, rhop, gdept_n(:,:,:) )  ! now in situ density for hpg computation
                             
@@ -306 +301 @@
 !!jc: That would be better, but see comment above
 !!
-      IF( lrst_oce   )   CALL rst_write     ( kstp )  ! write output ocean restart file
+      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