Ignore:
Timestamp:
2015-08-12T17:46:45+02:00 (5 years ago)
Author:
mattmartin
Message:

OBS simplification changes committed to branch after running SETTE tests to make sure we get the same results as the trunk for ORCA2_LIM_OBS.

Location:
branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/dtadyn.F90

    • Property svn:keywords set to Id
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90

    r4990 r5682  
    129129         &             nn_bench, nn_timing 
    130130      NAMELIST/namcfg/ cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, & 
    131          &             jpizoom, jpjzoom, jperio 
     131         &             jpizoom, jpjzoom, jperio, ln_use_jattr 
    132132      !!---------------------------------------------------------------------- 
    133133      ! 
    134134      cltxt = '' 
     135      cxios_context = 'nemo' 
    135136      ! 
    136137      !                             ! Open reference namelist and configuration namelist files 
     
    162163#if defined key_iomput 
    163164      IF( Agrif_Root() ) THEN 
    164          IF( lk_cpl ) THEN 
     165         IF( lk_oasis ) THEN 
    165166            CALL cpl_init( ilocal_comm )                               ! nemo local communicator given by oasis 
    166167            CALL xios_initialize( "oceanx",local_comm=ilocal_comm )    ! send nemo communicator to xios 
    167168         ELSE 
    168             CALL  xios_initialize( "nemo",return_comm=ilocal_comm )    ! nemo local communicator given by xios 
     169            CALL  xios_initialize( "for_xios_mpi_id",return_comm=ilocal_comm )    ! nemo local communicator given by xios 
    169170         ENDIF 
    170171      ENDIF 
    171172      ENDIF 
    172       narea = mynode( cltxt, numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )   ! Nodes selection 
     173      narea = mynode( cltxt, 'output.namelist.dyn', numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )   ! Nodes selection 
    173174#else 
    174       IF( lk_cpl ) THEN 
     175      IF( lk_oasis ) THEN 
    175176         IF( Agrif_Root() ) THEN 
    176177            CALL cpl_init( ilocal_comm )                               ! nemo local communicator given by oasis 
    177178         ENDIF 
    178          narea = mynode( cltxt, numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )   ! Nodes selection (control print return in cltxt) 
     179         narea = mynode( cltxt, 'output.namelist.dyn', numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )   ! Nodes selection (control print return in cltxt) 
    179180      ELSE 
    180181         ilocal_comm = 0 
    181          narea = mynode( cltxt, numnam_ref, numnam_cfg, numond , nstop )                ! Nodes selection (control print return in cltxt) 
     182         narea = mynode( cltxt, 'output.namelist.dyn', numnam_ref, numnam_cfg, numond , nstop )                ! Nodes selection (control print return in cltxt) 
    182183      ENDIF 
    183184#endif 
     
    233234         WRITE(numout,*) '                       NEMO team' 
    234235         WRITE(numout,*) '            Ocean General Circulation Model' 
    235          WRITE(numout,*) '                  version 3.4  (2011) ' 
     236         WRITE(numout,*) '                  version 3.6  (2015) ' 
    236237         WRITE(numout,*) 
    237238         WRITE(numout,*) 
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/obs_fbm.F90

    • Property svn:keywords set to Id
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/ooo_data.F90

    • Property svn:keywords set to Id
    r4132 r5682  
    4040   CHARACTER(len=128) :: & 
    4141      & alt_file                       !: altimeter file 
     42   !! $Id$ 
    4243CONTAINS 
    4344   SUBROUTINE ooo_data_init( ld_cl4 ) 
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/ooo_intp.F90

    • Property svn:keywords set to Id
    r4120 r5682  
    1616   PUBLIC ooo_interp 
    1717 
     18   !! $Id$ 
    1819   CONTAINS 
    1920 
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/ooo_read.F90

    • Property svn:keywords set to Id
    r4117 r5682  
    2222   PUBLIC ooo_rea_dri 
    2323 
     24   !! $Id$ 
    2425CONTAINS 
    2526   SUBROUTINE ooo_rea_dri(kfile) 
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/ooo_utils.F90

    • Property svn:keywords set to Id
    r4111 r5682  
    1010   REAL(kind=dp), PARAMETER :: obfilldbl=99999. 
    1111 
     12   !! $Id$ 
    1213   CONTAINS 
    1314 
  • branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/NEMO/OOO_SRC/ooo_write.F90

    • Property svn:keywords set to Id
    r4110 r5682  
    2929   END INTERFACE 
    3030 
     31   !! $Id$ 
    3132   CONTAINS 
    3233 
Note: See TracChangeset for help on using the changeset viewer.