Changeset 4154

Timestamp:

2013-11-05T13:52:36+01:00 (10 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013: minor corrections

Location:

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO

Files:

• OPA_SRC/CRS/crsini.F90 (modified) (2 diffs)
• OPA_SRC/DOM/dom_oce.F90 (modified) (1 diff)
• TOP_SRC/trcnam.F90 (modified) (5 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90

@@ -67 +67 @@
       INTEGER  :: ji,jj,jk      ! dummy indices
       INTEGER  :: ierr                                ! allocation error status
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
       REAL(wp), DIMENSION(:,:,:), POINTER :: zfse3t, zfse3u, zfse3v, zfse3w
 
       NAMELIST/namcrs/ nn_factx, nn_facty, nn_binref, nn_msh_crs, nn_crs_kz, ln_crs_wn
-
-
       !!----------------------------------------------------------------------
       !
@@ -85 +84 @@
      !---------------------------------------------------------
      !
-     REWIND( numnam )            ! Read Namelist namtra_qsr : ratio and length of penetration
-     READ  ( numnam, namcrs )        ! Namelist namcrs : Grid-coarsening utility namelist
+
+      REWIND( numnam_ref )              ! Namelist namrun in reference namelist : Parameters of the run
+      READ  ( numnam_ref, namcrs, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcrs in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namrun in configuration namelist : Parameters of the run
+      READ  ( numnam_cfg, namcrs, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcrs in configuration namelist', lwp )
+      WRITE ( numond, namcrs )
+
      IF(lwp) THEN
         WRITE(numout,*)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -42 +42 @@
    INTEGER , PUBLIC ::   nn_baro         !: number of barotropic time steps (key_dynspg_ts)
    INTEGER , PUBLIC ::   nn_closea       !: =0 suppress closed sea/lake from the ORCA domain or not (=1)
+   LOGICAL , PUBLIC ::   ln_crs          !: Apply grid coarsening to dynamical model output or online passive tracers
+
    !! Horizontal grid parameters for domhgr
    !! =====================================

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -56 +56 @@
       !!                ( (PISCES, CFC, MY_TRC )
       !!---------------------------------------------------------------------
+      INTEGER  ::   jn                  ! dummy loop indice
       !                                        !   Parameters of the run 
       IF( .NOT. lk_offline ) CALL trc_nam_run
@@ -176 +177 @@
         &                  cn_trcrst_in, cn_trcrst_out
 
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
+
       !!---------------------------------------------------------------------
 
@@ -193 +196 @@
       READ  ( numnat_cfg, namtrc_run, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc in configuration namelist', lwp )
-      WRITE ( numont, namtrc )
+      WRITE ( numont, namtrc_run )
 
       !  computes the first time step of tracer model
@@ -219 +222 @@
       !!
       !!---------------------------------------------------------------------
-      INTEGER ::  jn
-      ! Definition of a tracer as a structure
       TYPE(PTRACER), DIMENSION(jptra) :: sn_tracer  ! type of tracer for saving if not key_iomput
       !!
       NAMELIST/namtrc/ sn_tracer, ln_trcdta,ln_trcdmp, ln_trcdmp_clo
-
+  
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
+      INTEGER  ::   jn                  ! dummy loop indice
       !!---------------------------------------------------------------------
       IF(lwp) WRITE(numout,*)
@@ -269 +272 @@
       NAMELIST/namtrc_dia/ ln_diatrc, ln_diabio, nn_writedia, nn_writebio
 
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
       !!---------------------------------------------------------------------