New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6008 – NEMO

Changeset 6008


Ignore:
Timestamp:
2015-12-06T18:40:08+01:00 (8 years ago)
Author:
mathiot
Message:

MetO_merge_branch: minor change to run SETTE tests

Location:
branches/2015/dev_MetOffice_merge_2015/NEMOGCM
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/2015/dev_MetOffice_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref

    r6006 r6008  
    12041204   nn_profdavtypes = -1                ! Profile daily average types - array 
    12051205   ln_sstbias = .false.  
    1206    sstbias_files = 'sstbias.nc' 
     1206   cn_sstbias_files = 'sstbias.nc' 
    12071207/ 
    12081208!----------------------------------------------------------------------- 

  • branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OFF_SRC/domrea.F90

    r6006 r6008  
    113113      INTEGER  ::   ios   ! Local integer output status for namelist read 
    114114      ! 
    115       NAMELIST/namrun/ cn_ocerst_indir, cn_ocerst_outdir, nn_stocklist, ln_rst_list,               & 
    116          &             nn_no   , cn_exp    , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstctl,   & 
    117          &             nn_it000, nn_itend  , nn_date0    , nn_leapy     , nn_istate , nn_stock ,   & 
     115      NAMELIST/namrun/ cn_ocerst_indir, cn_ocerst_outdir, nn_stocklist, ln_rst_list,                         & 
     116         &             nn_no   , cn_exp    , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstctl,             & 
     117         &             nn_it000, nn_itend  , nn_date0    , nn_time0, nn_leapy     , nn_istate , nn_stock ,   & 
    118118         &             nn_write, ln_iscpl, ln_dimgnnn, ln_mskland  , ln_cfmeta    , ln_clobber, nn_chunksz, nn_euler 
    119119      NAMELIST/namdom/ nn_bathy , rn_bathy, rn_e3zps_min, rn_e3zps_rat, nn_msh    , rn_hmin, rn_isfhmin,  & 

  • branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90

    r5960 r6008  
    273273                            CALL  istate_init   ! ocean initial state (Dynamics and tracers) 
    274274 
    275       IF( lk_diaobs     ) THEN                  ! Observation & model comparison 
     275      IF( ln_diaobs     ) THEN                  ! Observation & model comparison 
    276276                            CALL dia_obs_init            ! Initialize observational data 
    277277                            CALL dia_obs( nit000 - 1 )   ! Observation operator for restart 

  • branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r6005 r6008  
    413413         CALL     sbc_init   ! Forcings : surface module 
    414414         CALL tra_qsr_init   ! penetrative solar radiation qsr 
    415          IF( lk_diaobs     ) THEN                  ! Observation & model comparison 
     415         IF( ln_diaobs     ) THEN                  ! Observation & model comparison 
    416416            CALL dia_obs_init            ! Initialize observational data 
    417417            CALL dia_obs( nit000 - 1 )   ! Observation operator for restart 

  • branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90

    r6005 r6008  
    437437      ENDIF 
    438438 
    439       IF( lk_diaobs  )         CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics (call after dynamics update) 
     439      IF( ln_diaobs  )         CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics (call after dynamics update) 
    440440      
    441441      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  
Note: See TracChangeset for help on using the changeset viewer.