Changeset 5296 for branches/2015/dev_r5177_CNRS4_stopar/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2015-05-27T12:47:55+02:00 (9 years ago)

Author:

pabouttier

Message:

Commit stochastic parametrization module and perturbation of EOS

File:

• branches/2015/dev_r5177_CNRS4_stopar/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (16 diffs)

branches/2015/dev_r5177_CNRS4_stopar/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -29 +29 @@
    !!            3.3.1! 2011-01  (A. R. Porter, STFC Daresbury) dynamical allocation
    !!            3.4  ! 2011-11  (C. Harris) decomposition changes for running with CICE
-   !!                 ! 2012-05  (C. Calone, J. Simeon, G. Madec, C. Ethe) Add grid coarsening 
+   !!                 ! 2012-05  (C. Calone, J. Simeon, G. Madec, C. Ethe) Add grid coarsening
    !!----------------------------------------------------------------------
 
@@ -59 +59 @@
    USE phycst          ! physical constant                  (par_cst routine)
    USE trdini          ! dyn/tra trends initialization     (trd_init routine)
-   USE asminc          ! assimilation increments     
+   USE asminc          ! assimilation increments
    USE asmbkg          ! writing out state trajectory
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
@@ -81 +81 @@
    USE sbctide, ONLY: lk_tide
    USE crsini          ! initialise grid coarsening utility
-   USE lbcnfd, ONLY: isendto, nsndto, nfsloop, nfeloop ! Setup of north fold exchanges 
+   USE lbcnfd, ONLY: isendto, nsndto, nfsloop, nfeloop ! Setup of north fold exchanges
+   USE stopar
+   USE stopts
 
    IMPLICIT NONE
@@ -125 +127 @@
 #if defined key_agrif
       CALL Agrif_Declare_Var_dom   ! AGRIF: set the meshes for DOM
-      CALL Agrif_Declare_Var       !  "      "   "   "      "  DYN/TRA 
+      CALL Agrif_Declare_Var       !  "      "   "   "      "  DYN/TRA
 # if defined key_top
       CALL Agrif_Declare_Var_top   !  "      "   "   "      "  TOP
@@ -197 +199 @@
       IF( lk_cpl ) CALL cpl_finalize    ! end coupling and mpp communications with OASIS
 #else
-      IF( lk_cpl ) THEN 
+      IF( lk_cpl ) THEN
          CALL cpl_finalize              ! end coupling and mpp communications with OASIS
       ELSE
@@ -246 +248 @@
       REWIND( numnam_cfg )              ! Namelist namcfg in confguration namelist : Control prints & Benchmark
       READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 )
-904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )   
+904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )
 
 ! Force values for AGRIF zoom (cf. agrif_user.F90)
@@ -322 +324 @@
 #if defined key_nemocice_decomp
          jpi = ( nx_global+2-2*jpreci + (jpni-1) ) / jpni + 2*jpreci ! first  dim.
-         jpj = ( ny_global+2-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj ! second dim. 
+         jpj = ( ny_global+2-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj ! second dim.
 #else
          jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   ! first  dim.
@@ -392 +394 @@
 
                             CALL dyn_nept_init  ! simplified form of Neptune effect
-      !     
+      !
       IF( ln_crs        )   CALL     crs_init   ! Domain initialization of coarsened grid
       !
@@ -432 +434 @@
       IF( nn_cla == 1 .AND. cp_cfg == 'orca' .AND. jp_cfg == 2 )   CALL cla_init       ! Cross Land Advection
                             CALL icb_init( rdt, nit000)   ! initialise icebergs instance
-     
+                            CALL sto_par_init   ! Stochastic parametrization
+      IF( ln_sto_eos     )  CALL sto_pts_init   ! RRandom T/S fluctuations
+
 #if defined key_top
       !                                     ! Passive tracers
@@ -506 +510 @@
          WRITE(numout,*) '      left bottom i index of the zoom (in data domain) jpizoom = ', jpizoom
          WRITE(numout,*) '      left bottom j index of the zoom (in data domain) jpizoom = ', jpjzoom
-         WRITE(numout,*) '      lateral cond. type (between 0 and 6) jperio = ', jperio   
+         WRITE(numout,*) '      lateral cond. type (between 0 and 6) jperio = ', jperio
          WRITE(numout,*) '      use file attribute if exists as i/p j-start ln_use_jattr = ', ln_use_jattr
       ENDIF
@@ -607 +611 @@
       USE ldftra_oce, ONLY: ldftra_oce_alloc
       USE trc_oce   , ONLY: trc_oce_alloc
-#if defined key_diadct 
-      USE diadct    , ONLY: diadct_alloc 
-#endif 
+#if defined key_diadct
+      USE diadct    , ONLY: diadct_alloc
+#endif
 #if defined key_bdy
       USE bdy_oce   , ONLY: bdy_oce_alloc
@@ -626 +630 @@
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays
       !
-#if defined key_diadct 
-      ierr = ierr + diadct_alloc    ()          ! 
-#endif 
+#if defined key_diadct
+      ierr = ierr + diadct_alloc    ()          !
+#endif
 #if defined key_bdy
       ierr = ierr + bdy_oce_alloc   ()          ! bdy masks (incl. initialization)
@@ -757 +761 @@
       !!======================================================================
       !!                     ***  ROUTINE  nemo_northcomms  ***
-      !! nemo_northcomms    :  Setup for north fold exchanges with explicit 
+      !! nemo_northcomms    :  Setup for north fold exchanges with explicit
       !!                       point-to-point messaging
       !!=====================================================================
@@ -765 +769 @@
       !!----------------------------------------------------------------------
       !!    1.0  ! 2011-10  (A. C. Coward, NOCS & J. Donners, PRACE)
-      !!    2.0  ! 2013-06 Setup avoiding MPI communication (I. Epicoco, S. Mocavero, CMCC) 
+      !!    2.0  ! 2013-06 Setup avoiding MPI communication (I. Epicoco, S. Mocavero, CMCC)
       !!----------------------------------------------------------------------
 
@@ -772 +776 @@
 
       njmppmax = MAXVAL( njmppt )
-    
+
       !initializes the north-fold communication variables
       isendto(:) = 0
@@ -788 +792 @@
           !loop over the other north-fold processes to find the processes
           !managing the points belonging to the sxT-dxT range
-  
+
           DO jn = 1, jpni
                 !sxT is the first point (in the global domain) of the jn