Changeset 4152 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2013-11-05T12:59:53+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013 the 2nd development branch dev_r3940_CNRS4_IOCRS, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/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 
    !!----------------------------------------------------------------------
 
@@ -84 +85 @@
 #endif
    USE sbctide, ONLY: lk_tide
+   USE crsini          ! initialise grid coarsening utility
 
    IMPLICIT NONE
@@ -388 +390 @@
                             CALL dyn_nept_init  ! simplified form of Neptune effect
 
-      !                                     ! Ocean physics
+      !     
+      IF( ln_crs        )   CALL     crs_init   ! Domain initialization of coarsened grid
+      !
+                                ! Ocean physics
                             CALL     sbc_init   ! Forcings : surface module
       !                                         ! Vertical physics
@@ -621 +626 @@
       ierr = ierr + zdf_oce_alloc   ()          ! ocean vertical physics
       !
-      ierr = ierr + lib_mpp_alloc   (numout)    ! mpp exchanges
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays
       !