Changeset 5965 for branches/2014/dev_r4650_UKMO14.5_SST_BIAS_CORRECTION/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90

Timestamp:

2015-12-01T16:35:30+01:00 (8 years ago)

Author:

timgraham

Message:

Upgraded branch to r5518 of trunk (v3.6 stable revision)

File:

• branches/2014/dev_r4650_UKMO14.5_SST_BIAS_CORRECTION/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90 (modified) (4 diffs, 1 prop)

branches/2014/dev_r4650_UKMO14.5_SST_BIAS_CORRECTION/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90

@@ -26 +26 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: domc1d.F90 3851 2013-04-30 10:30:51Z hadcv $ 
+   !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -43 +43 @@
       !! ** Action  : Recalculate jpizoom, jpjzoom (indices of C1D zoom)
       !!----------------------------------------------------------------------
+      NAMELIST/namdom/ nn_bathy, rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,   &
+         &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,                  &
+         &             rn_rdtmax, rn_rdth     , nn_closea , ln_crs,    &
+         &             jphgr_msh, &
+         &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m, &
+         &             ppsur, ppa0, ppa1, ppkth, ppacr, ppdzmin, pphmax, ldbletanh, &
+         &             ppa2, ppkth2, ppacr2
+
       INTEGER  ::  ji, jj                          ! Dummy loop indices
       INTEGER  ::  inum                            ! Coordinate file handle (case 0)
       INTEGER  ::  ijeq                            ! Index of equator T point (case 4)
+      INTEGER  ::  ios                             ! Local integer output status for namelist read
 
       INTEGER , DIMENSION(2) ::   iloc             ! Minloc returned indices
@@ -63 +72 @@
       IF( nn_timing == 1 )   CALL timing_start('dom_c1d')
 
+      REWIND( numnam_ref )              ! Namelist namdom in reference namelist : space & time domain (bathymetry, mesh, timestep)
+      READ  ( numnam_ref, namdom, IOSTAT = ios, ERR = 901 )
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdom in reference namelist', lwp )
+  
+      !
+      REWIND( numnam_cfg )              ! Namelist namdom in configuration namelist : space & time domain (bathymetry, mesh, timestep)
+      READ  ( numnam_cfg, namdom, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdom in configuration namelist', lwp )
+
       CALL wrk_alloc( jpidta, jpjdta, gphidta, glamdta, zdist )
 
@@ -80 +98 @@
          CALL iom_get( inum, jpdom_unknown, 'gphit', gphidta ) ! so use jpdom_unknown not jpdom_data
          CALL iom_close ( inum )
-
-         PRINT *,'Check dom_c1d coordinates file data read in:' !!!
-         PRINT *,'Bottom-left most glamdta is ', glamdta(1,1)    !!! Need to check
-         PRINT *,'Bottom-left most gphidta is ', gphidta(1,1)    !!! field read
-         PRINT *,'We are using nimpp,njmpp = ' , nimpp,njmpp     !!!
 
       CASE ( 1 )                 ! geographical mesh on the sphere with regular grid-spacing