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.
ticket/1020_dev_NOC_MERCATOR_2012 (diff) – NEMO

Changes between Version 3 and Version 4 of ticket/1020_dev_NOC_MERCATOR_2012


Ignore:
Timestamp:
2012-11-26T12:14:02+01:00 (12 years ago)
Author:
acc
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1020_dev_NOC_MERCATOR_2012

    v3 v4  
    2020cd dev_NOC_MERCATOR_2012 
    2121svn  merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_MERCATOR_2012_rev3555 . 
     22 
     23--- Merging r3556 through r3653 into '.': 
     24U    NEMOGCM/SETTE/iodef_sette.xml 
     25U    NEMOGCM/SETTE/sette.sh 
     26U    NEMOGCM/SETTE/param.cfg 
     27U    NEMOGCM/SETTE/prepare_job.sh 
     28U    NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER 
     29U    NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist 
     30U    NEMOGCM/CONFIG/GYRE/EXP00/namelist 
     31U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist 
     32U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist 
     33U    NEMOGCM/CONFIG/AMM12/EXP00/namelist 
     34--- Merging r3556 through r3653 into 'NEMOGCM/CONFIG/cfg.txt': 
     35 G   NEMOGCM/CONFIG/cfg.txt 
     36--- Merging r3556 through r3653 into 'NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm': 
     37 G   NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm 
     38--- Merging r3556 through r3653 into 'NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm': 
     39 G   NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm 
     40--- Merging r3556 through r3653 into 'NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm': 
     41 G   NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm 
     42--- Merging r3556 through r3653 into '.': 
     43U    NEMOGCM/ARCH/arch-ifort_MERCATOR_CLUSTER.fcm 
     44C    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 
     45U    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 
     46U    NEMOGCM/NEMO/OPA_SRC/step_oce.F90 
     47A    NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 
     48U    NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 
     49U    NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 
     50U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 
     51U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 
     52U    NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 
     53U    NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 
     54U    NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 
     55U    NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 
     56U    NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 
     57U    NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 
     58U    NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 
     59U    NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 
     60U    NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 
     61U    NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 
     62U    NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 
     63U    NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 
     64U    NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 
     65U    NEMOGCM/NEMO/OPA_SRC/step.F90 
     66 G   . 
     67Summary of conflicts: 
     68  Text conflicts: 1 
    2269}}} 
    2370 
     71Resolve simple conflicts and check in.