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/1367_NOC2_ZTS (diff) – NEMO

Changes between Version 5 and Version 6 of ticket/1367_NOC2_ZTS


Ignore:
Timestamp:
2014-11-28T12:54:51+01:00 (9 years ago)
Author:
acc
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1367_NOC2_ZTS

    v5 v6  
    173173 [[Image(t1440_good.png)]] Icebergs trajectories near the north-fold after fix 
    174174 [[Image(orca1trajs_sm.png)]] More comprehensive test (ORCA1) of icebergs trajectories in the Arctic Basin 
     175 
     176'''Preparing for 2014 merge''' 
     177 
     178This branch has been prepared for the 2014 merge by the addition of trunk chanes between revision 4743 and 4879: 
     179 
     180 
     181{{{ 
     182svn merge  svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4743 \ 
     183            svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4879 ./  
     184svn ci -m 'Branch 2014/dev_r4743_NOC2_ZTS. Merged in trunk changes from r4743 to r4879 in \ 
     185                  preparation for the annual merge. See ticket #1367 and https://forge.ipsl.jussieu.fr/nemo/wiki/ticket/1367_NOC2_ZTS' 
     186 
     187Sending    DOC/TexFiles/Chapters/Chap_DYN.tex 
     188Sending    NEMOGCM/ARCH/CMCC/arch-PW6_calypso.fcm 
     189Sending    NEMOGCM/ARCH/CMCC/arch-PW6_calypso_debug.fcm 
     190Sending    NEMOGCM/ARCH/CMCC/arch-PW6_calypso_tools.fcm 
     191Sending    NEMOGCM/ARCH/CMCC/arch-gfortran_athena_xios.fcm 
     192Sending    NEMOGCM/ARCH/CMCC/arch-ifort_athena.fcm 
     193Sending    NEMOGCM/ARCH/CMCC/arch-ifort_athena_debug.fcm 
     194Sending    NEMOGCM/ARCH/CMCC/arch-ifort_athena_tools.fcm 
     195Sending    NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm 
     196Sending    NEMOGCM/ARCH/INGV/arch-IBM_EKMAN_INGV.fcm 
     197Sending    NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm 
     198Sending    NEMOGCM/ARCH/arch-PW7_C2A_XIO.fcm 
     199Sending    NEMOGCM/ARCH/arch-PW7_METO.fcm 
     200Sending    NEMOGCM/ARCH/arch-X64_CURIE.fcm 
     201Sending    NEMOGCM/ARCH/arch-X64_MOBILIS.fcm 
     202Sending    NEMOGCM/ARCH/arch-X64_VAYU.fcm 
     203Sending    NEMOGCM/ARCH/arch-X64_YELLOWSTONE.fcm 
     204Sending    NEMOGCM/ARCH/arch-XC_ARCHER.fcm 
     205Sending    NEMOGCM/ARCH/arch-XC_ARCHER_INTEL.fcm 
     206Sending    NEMOGCM/ARCH/arch-macport_osx.fcm 
     207Sending    NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm 
     208Sending    NEMOGCM/ARCH/arch-x3750_ADA.fcm 
     209Sending    NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg 
     210Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/README 
     211Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_IceFrac.pro 
     212Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_all.pro 
     213Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh 
     214Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh.old_names 
     215Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_ICE.pro 
     216Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_ICE_FRAM.pro 
     217Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_ICE_Vol.pro 
     218Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_all.pro 
     219Sending    NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_vardef.sh 
     220Sending    NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml 
     221Sending    NEMOGCM/CONFIG/SHARED/1_namelist_ref 
     222Sending    NEMOGCM/CONFIG/SHARED/field_def.xml 
     223Sending    NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref 
     224Sending    NEMOGCM/CONFIG/SHARED/namelist_ref 
     225Sending    NEMOGCM/NEMO/LIM_SRC_3/ice.F90 
     226Sending    NEMOGCM/NEMO/LIM_SRC_3/iceini.F90 
     227Sending    NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 
     228Sending    NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 
     229Sending    NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 
     230Sending    NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 
     231Sending    NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 
     232Sending    NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 
     233Sending    NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 
     234Sending    NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 
     235Sending    NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 
     236Sending    NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 
     237Sending    NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 
     238Sending    NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 
     239Sending    NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 
     240Sending    NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 
     241Sending    NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 
     242Sending    NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 
     243Sending    NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 
     244Sending    NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 
     245Sending    NEMOGCM/NEMO/LIM_SRC_3/par_ice.F90 
     246Sending    NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 
     247Sending    NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 
     248Sending    NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 
     249Sending    NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 
     250Sending    NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 
     251Sending    NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 
     252Sending    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 
     253Sending    NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 
     254Sending    NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 
     255Sending    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 
     256Sending    NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 
     257Sending    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 
     258Sending    NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 
     259Sending    NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 
     260Sending    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 
     261Sending    NEMOGCM/NEMO/OPA_SRC/oce.F90 
     262Sending    NEMOGCM/NEMO/OPA_SRC/step.F90 
     263Sending    NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 
     264Sending    NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 
     265Sending    NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 
     266Sending    NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 
     267Sending    NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA 
     268Sending    NEMOGCM/SETTE/iodef_sette.xml 
     269Sending    NEMOGCM/SETTE/prepare_exe_dir.sh 
     270Sending    NEMOGCM/SETTE/prepare_job.sh 
     271Sending    NEMOGCM/SETTE/sette.sh 
     272Sending    NEMOGCM/SETTE/sette_beginner.sh 
     273Sending    NEMOGCM/TOOLS/COMPILE/bld.cfg 
     274Sending    NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg 
     275Sending    NEMOGCM/TOOLS/COMPILE/bld_tools.cfg 
     276Sending    NEMOGCM/TOOLS/COMPILE/bldxag.cfg 
     277Adding     NEMOGCM/ARCH/arch-x3750_ADA_O0.fcm 
     278Adding     NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_MLD_ortho.pro 
     279Adding     NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh.pstar4-testht 
     280Adding     NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL 
     281Adding     NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA_O0 
     282Adding     NEMOGCM/SETTE/input_ORCA2_LIM3.cfg 
     283 
     284Committed revision 4899. 
     285}}} 
     286 
     287And finally by confirmation that the branch passes SETTE tests: 
     288 
     289 
     290{{{ 
     291 ./sette_rpt 
     292GYRE        restartability  passed 
     293ORCA2LIMPIS restartability  passed 
     294ORCA2OFFPIS restartability  passed 
     295AMM12       restartability  passed 
     296SAS         restartability  inconclusive (  solver.stat  not found ) 
     297 
     298GYRE        reproducibility passed 
     299ORCA2LIMPIS reproducibility passed 
     300ORCA2OFFPIS reproducibility passed 
     301AMM12       reproducibility passed 
     302SAS         reproducibility inconclusive (  solver.stat  not found ) 
     303}}}