Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/STO

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/STO/stopar.F90 (modified) (5 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/STO/stopar.F90

@@ -159 +159 @@
       INTEGER  :: ji, jj, jk, jsto, jflt
       REAL(wp) :: stomax
-
+      !!----------------------------------------------------------------------
       !
       ! Update 2D stochastic arrays
@@ -235 +235 @@
          CALL lbc_lnk( sto3d(:,:,:,jsto), sto3d_typ(jsto), sto3d_sgn(jsto) )
       END DO
-
+      !
    END SUBROUTINE sto_par
 
@@ -267 +267 @@
       REWIND( numnam_cfg )              ! Namelist namdyn_adv in configuration namelist : Momentum advection scheme
       READ  ( numnam_cfg, namsto, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsto in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namsto in configuration namelist', lwp )
       IF(lwm) WRITE ( numond, namsto )
+
+      IF( .NOT.ln_rststo ) THEN   ! no use of stochastic parameterization
+         IF(lwp) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) 'sto_par_init : NO use of stochastic parameterization'
+            WRITE(numout,*) '~~~~~~~~~~~~'
+         ENDIF
+         RETURN
+      ENDIF
 
       !IF(ln_ens_rst_in) cn_storst_in = cn_mem//cn_storst_in
@@ -673 +682 @@
       !!                  ***  ROUTINE sto_rst_read  ***
       !!
-
       !! ** Purpose :   read stochastic parameters from restart file
       !!----------------------------------------------------------------------
-
       INTEGER  :: jsto, jseed
       INTEGER(KIND=8)     ::   ziseed(4)           ! RNG seeds in integer type
@@ -683 +690 @@
       CHARACTER(LEN=9)    ::   clsto3d='sto3d_000' ! stochastic parameter variable name
       CHARACTER(LEN=10)   ::   clseed='seed0_0000' ! seed variable name
+      !!----------------------------------------------------------------------
 
       IF ( jpsto2d > 0 .OR. jpsto3d > 0 ) THEN