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 14574 – NEMO

Context Navigation

← Previous Changeset
Next Changeset →

Changeset 14574

Timestamp:

2021-03-03T16:04:57+01:00 (3 years ago)

Author:

hadcv

Message:

#2600: Merge in trunk changes to r14509

Location:

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling

Files:

: 5 deleted
: 205 edited
: 5 copied

. (modified) (view diffs)
INSTALL.rst (modified) (view diffs)
README.rst (modified) (view diffs)
cfgs (modified) (view diffs)
cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-pisces.xml (modified) (view diffs)
cfgs/README.rst (modified) (view diffs)
cfgs/SHARED (modified) (view diffs)
cfgs/SHARED/namelist_ref (modified) (view diffs)
cfgs/WED025/MY_SRC (deleted)
doc (modified) (view diffs)
doc/NEMO_manual_state.txt (modified) (view diffs)
doc/latex/.svnignore (modified) (view diffs)
doc/latex/NEMO/build (modified) (view diffs)
doc/latex/NEMO/main/bibliography.bib (modified) (view diffs)
doc/latex/NEMO/main/settings.tex (modified) (view diffs)
doc/latex/NEMO/subfiles (modified) (view diffs)
doc/latex/NEMO/subfiles/apdx_DOMAINcfg.tex (modified) (view diffs)
doc/latex/NEMO/subfiles/chap_DOM.tex (modified) (view diffs)
doc/latex/NEMO/subfiles/chap_LBC.tex (modified) (view diffs)
doc/latex/NEMO/subfiles/chap_SBC.tex (modified) (view diffs)
doc/latex/NEMO/subfiles/chap_misc.tex (modified) (view diffs)
doc/latex/SI3/build (modified) (view diffs)
doc/latex/SI3/main/bibliography.bib (modified) (view diffs)
doc/latex/SI3/main/settings.tex (modified) (view diffs)
doc/latex/SI3/subfiles (modified) (view diffs)
doc/latex/TOP/build (modified) (view diffs)
doc/latex/TOP/main/bibliography.bib (modified) (view diffs)
doc/latex/TOP/main/settings.tex (modified) (view diffs)
doc/latex/TOP/subfiles (modified) (view diffs)
doc/latex/TOP/subfiles/model_description.tex (modified) (view diffs)
doc/latex/global/latexmk.pl (modified) (view diffs)
doc/latex/template.tex (copied) (copied from NEMO/trunk/doc/latex/template.tex) (view diffs)
doc/namelists/namberg (modified) (view diffs)
doc/rst/source/conf.py (modified) (view diffs)
doc/rst/source/guide.rst (modified) (view diffs)
src (modified) (view diffs)
src/ABL/ablmod.F90 (modified) (view diffs)
src/ICE/icecor.F90 (modified) (view diffs)
src/ICE/icedyn_adv_pra.F90 (modified) (view diffs)
src/ICE/icedyn_adv_umx.F90 (modified) (view diffs)
src/ICE/icedyn_rhg_eap.F90 (modified) (view diffs)
src/ICE/icedyn_rhg_evp.F90 (modified) (view diffs)
src/ICE/icedyn_rhg_vp.F90 (modified) (view diffs)
src/ICE/icesbc.F90 (modified) (view diffs)
src/ICE/icethd.F90 (modified) (view diffs)
src/ICE/icethd_do.F90 (modified) (view diffs)
src/ICE/iceupdate.F90 (modified) (view diffs)
src/NST/agrif_oce_interp.F90 (modified) (view diffs)
src/NST/agrif_oce_sponge.F90 (modified) (view diffs)
src/NST/agrif_user.F90 (modified) (view diffs)
src/NST/vremap.F90 (modified) (view diffs)
src/OCE/BDY/bdydyn2d.F90 (modified) (view diffs)
src/OCE/BDY/bdydyn3d.F90 (modified) (view diffs)
src/OCE/BDY/bdyice.F90 (modified) (view diffs)
src/OCE/BDY/bdyini.F90 (modified) (view diffs)
src/OCE/BDY/bdytra.F90 (modified) (view diffs)
src/OCE/CRS/crs.F90 (modified) (view diffs)
src/OCE/CRS/crsdom.F90 (modified) (view diffs)
src/OCE/CRS/crslbclnk.F90 (modified) (view diffs)
src/OCE/DIA/diacfl.F90 (modified) (view diffs)
src/OCE/DIA/diawri.F90 (modified) (view diffs)
src/OCE/DOM/dom_oce.F90 (modified) (view diffs)
src/OCE/DOM/domain.F90 (modified) (view diffs)
src/OCE/DOM/dommsk.F90 (modified) (view diffs)
src/OCE/DOM/domqco.F90 (modified) (view diffs)
src/OCE/DOM/domvvl.F90 (modified) (view diffs)
src/OCE/DOM/domwri.F90 (modified) (view diffs)
src/OCE/DOM/domzgr.F90 (modified) (view diffs)
src/OCE/DYN/dynadv_ubs.F90 (modified) (view diffs)
src/OCE/DYN/dynatf.F90 (modified) (view diffs)
src/OCE/DYN/dynatf_qco.F90 (modified) (view diffs)
src/OCE/DYN/dynhpg.F90 (modified) (view diffs)
src/OCE/DYN/dynldf_iso.F90 (modified) (view diffs)
src/OCE/DYN/dynldf_lap_blp.F90 (modified) (view diffs)
src/OCE/DYN/dynspg_ts.F90 (modified) (view diffs)
src/OCE/DYN/dynvor.F90 (modified) (view diffs)
src/OCE/DYN/wet_dry.F90 (modified) (view diffs)
src/OCE/ICB/icbdia.F90 (modified) (view diffs)
src/OCE/ICB/icbdyn.F90 (modified) (view diffs)
src/OCE/ICB/icbini.F90 (modified) (view diffs)
src/OCE/ICB/icblbc.F90 (modified) (view diffs)
src/OCE/ICB/icbutl.F90 (modified) (view diffs)
src/OCE/IOM/iom_nf90.F90 (modified) (view diffs)
src/OCE/ISF/isfcav.F90 (modified) (view diffs)
src/OCE/ISF/isfcpl.F90 (modified) (view diffs)
src/OCE/ISF/isfpar.F90 (modified) (view diffs)
src/OCE/LBC/lbc_lnk_call_generic.h90 (copied) (copied from NEMO/trunk/src/OCE/LBC/lbc_lnk_call_generic.h90) (view diffs)
src/OCE/LBC/lbc_lnk_multi_generic.h90 (deleted)
src/OCE/LBC/lbc_lnk_nc_generic.h90 (deleted)
src/OCE/LBC/lbc_lnk_neicoll_generic.h90 (copied) (copied from NEMO/trunk/src/OCE/LBC/lbc_lnk_neicoll_generic.h90) (view diffs)
src/OCE/LBC/lbc_lnk_pt2pt_generic.h90 (copied) (copied from NEMO/trunk/src/OCE/LBC/lbc_lnk_pt2pt_generic.h90) (view diffs)
src/OCE/LBC/lbc_nfd_ext_generic.h90 (modified) (view diffs)
src/OCE/LBC/lbc_nfd_generic.h90 (modified) (view diffs)
src/OCE/LBC/lbc_nfd_nogather_generic.h90 (modified) (view diffs)
src/OCE/LBC/lbclnk.F90 (modified) (view diffs)
src/OCE/LBC/lbcnfd.F90 (modified) (view diffs)
src/OCE/LBC/lib_mpp.F90 (modified) (view diffs)
src/OCE/LBC/mpp_lbc_north_icb_generic.h90 (modified) (view diffs)
src/OCE/LBC/mpp_lnk_generic.h90 (deleted)
src/OCE/LBC/mpp_lnk_icb_generic.h90 (modified) (view diffs)
src/OCE/LBC/mpp_nc_generic.h90 (deleted)
src/OCE/LBC/mpp_nfd_generic.h90 (modified) (view diffs)
src/OCE/LBC/mppini.F90 (modified) (view diffs)
src/OCE/LDF/ldfc1d_c2d.F90 (modified) (view diffs)
src/OCE/LDF/ldfdyn.F90 (modified) (view diffs)
src/OCE/LDF/ldfslp.F90 (modified) (view diffs)
src/OCE/LDF/ldftra.F90 (modified) (view diffs)
src/OCE/OBS/obs_averg_h2d.F90 (modified) (view diffs)
src/OCE/OBS/obs_grid.F90 (modified) (view diffs)
src/OCE/OBS/obs_mpp.F90 (modified) (view diffs)
src/OCE/OBS/obs_prep.F90 (modified) (view diffs)
src/OCE/OBS/obs_read_prof.F90 (modified) (view diffs)
src/OCE/OBS/obs_read_surf.F90 (modified) (view diffs)
src/OCE/OBS/obs_utils.F90 (modified) (view diffs)
src/OCE/OBS/obs_write.F90 (modified) (view diffs)
src/OCE/SBC/cpl_oasis3.F90 (modified) (view diffs)
src/OCE/SBC/fldread.F90 (modified) (view diffs)
src/OCE/SBC/geo2ocean.F90 (modified) (view diffs)
src/OCE/SBC/sbcblk.F90 (modified) (view diffs)
src/OCE/SBC/sbccpl.F90 (modified) (view diffs)
src/OCE/SBC/sbcflx.F90 (modified) (view diffs)
src/OCE/SBC/sbcice_cice.F90 (modified) (view diffs)
src/OCE/SBC/sbcwave.F90 (modified) (view diffs)
src/OCE/TDE/tide.h90 (modified) (view diffs)
src/OCE/TRA/traadv.F90 (modified) (view diffs)
src/OCE/TRA/traadv_cen.F90 (modified) (view diffs)
src/OCE/TRA/traadv_fct.F90 (modified) (view diffs)
src/OCE/TRA/traadv_fct_lf.F90 (modified) (view diffs)
src/OCE/TRA/traadv_mus.F90 (modified) (view diffs)
src/OCE/TRA/traadv_qck.F90 (modified) (view diffs)
src/OCE/TRA/traadv_ubs.F90 (modified) (view diffs)
src/OCE/TRA/traatf.F90 (modified) (view diffs)
src/OCE/TRA/traatf_qco.F90 (modified) (view diffs)
src/OCE/TRA/trabbl.F90 (modified) (view diffs)
src/OCE/TRA/tramle.F90 (modified) (view diffs)
src/OCE/TRA/trazdf.F90 (modified) (view diffs)
src/OCE/TRA/zpshde.F90 (modified) (view diffs)
src/OCE/TRD/trddyn.F90 (modified) (view diffs)
src/OCE/TRD/trdken.F90 (modified) (view diffs)
src/OCE/TRD/trdmxl.F90 (modified) (view diffs)
src/OCE/TRD/trdvor.F90 (modified) (view diffs)
src/OCE/USR/README.rst (modified) (view diffs)
src/OCE/USR/usrdef_nam.F90 (modified) (view diffs)
src/OCE/USR/usrdef_sbc.F90 (modified) (view diffs)
src/OCE/ZDF/zdfmfc.F90 (modified) (view diffs)
src/OCE/ZDF/zdfosm.F90 (modified) (view diffs)
src/OCE/ZDF/zdfphy.F90 (modified) (view diffs)
src/OCE/lib_fortran.F90 (modified) (view diffs)
src/OCE/module_example.F90 (modified) (view diffs)
src/OCE/nemogcm.F90 (modified) (view diffs)
src/OCE/par_kind.F90 (modified) (view diffs)
src/OCE/par_oce.F90 (modified) (view diffs)
src/OCE/stpctl.F90 (modified) (view diffs)
src/OCE/stpmlf.F90 (modified) (view diffs)
src/OFF/dtadyn.F90 (modified) (view diffs)
src/OFF/nemogcm.F90 (modified) (view diffs)
src/SAO/nemogcm.F90 (modified) (view diffs)
src/SAS/nemogcm.F90 (modified) (view diffs)
src/SAS/stpctl.F90 (modified) (view diffs)
src/SWE/nemogcm.F90 (modified) (view diffs)
src/SWE/stp_oce.F90 (modified) (view diffs)
src/SWE/stpctl.F90 (copied) (copied from NEMO/trunk/src/SWE/stpctl.F90) (view diffs)
src/SWE/stpmlf.F90 (modified) (view diffs)
src/SWE/stprk3.F90 (modified) (view diffs)
src/TOP/PISCES/P2Z/p2zbio.F90 (modified) (view diffs)
src/TOP/README.rst (modified) (view diffs)
src/TOP/TRP/trcadv.F90 (modified) (view diffs)
src/TOP/TRP/trdmxl_trc.F90 (modified) (view diffs)
src/TOP/oce_trc.F90 (modified) (view diffs)
tests (modified) (view diffs)
tests/BENCH/EXPREF/namelist_cfg_orca025_like (modified) (view diffs)
tests/BENCH/EXPREF/namelist_cfg_orca12_like (modified) (view diffs)
tests/BENCH/EXPREF/namelist_cfg_orca1_like (modified) (view diffs)
tests/BENCH/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/BENCH/MY_SRC/usrdef_sbc.F90 (modified) (view diffs)
tests/BENCH/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
tests/C1D_ASICS/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/CANAL/EXPREF/namelist_cfg (modified) (view diffs)
tests/CANAL/MY_SRC/usrdef_hgr.F90 (modified) (view diffs)
tests/CANAL/MY_SRC/usrdef_istate.F90 (modified) (view diffs)
tests/CANAL/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/CANAL/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
tests/DOME/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/DOME/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
tests/ICB/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/ICE_ADV1D/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/ICE_ADV2D/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/ICE_RHEO/MY_SRC/icedyn_rhg_eap.F90 (modified) (view diffs)
tests/ICE_RHEO/MY_SRC/icedyn_rhg_evp.F90 (modified) (view diffs)
tests/ICE_RHEO/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/ICE_RHEO/MY_SRC/usrdef_sbc.F90 (modified) (view diffs)
tests/ISOMIP/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
tests/OVERFLOW/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/OVERFLOW/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
tests/README.rst (modified) (view diffs)
tests/STATION_ASF/MY_SRC/icesbc.F90 (modified) (view diffs)
tests/STATION_ASF/MY_SRC/nemogcm.F90 (modified) (view diffs)
tests/STATION_ASF/MY_SRC/stpctl.F90 (modified) (view diffs)
tests/STATION_ASF/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/SWG/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/SWG/MY_SRC/usrdef_sbc.F90 (modified) (view diffs)
tests/SWG/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
tests/TSUNAMI/EXPREF/namelist_cfg (modified) (view diffs)
tests/TSUNAMI/MY_SRC/usrdef_hgr.F90 (modified) (view diffs)
tests/TSUNAMI/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/TSUNAMI/MY_SRC/usrdef_sbc.F90 (modified) (view diffs)
tests/VORTEX/MY_SRC/usrdef_istate.F90 (modified) (view diffs)
tests/VORTEX/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/VORTEX/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
tests/WAD/MY_SRC/usrdef_nam.F90 (modified) (view diffs)
tests/WAD/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/NEMO/build

Property svn:ignore

-                      old
+                      new
 *.lo*
 *.out
+*.pdf
+*.pyg
+*.tdo
 *.toc
 *.xdv

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/NEMO/main/bibliography.bib
- Property svn:eol-style set to native

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/NEMO/subfiles

Property svn:ignore

-                      old
+                      new
+*.aux
+*.bbl
+*.blg
+*.fdb*
+*.fls
+*.idx
+*.ilg
 *.ind
+*.ilg
+*.lo*
+*.out
+*.pdf
+*.pyg
+*.tdo
+*.toc
+*.xdv
+cache*

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/SI3/build

Property svn:ignore

-                      old
+                      new
 *.lo*
 *.out
+*.pdf
+*.pyg
+*.tdo
 *.toc
 *.xdv

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/SI3/main/bibliography.bib
- Property svn:eol-style set to native

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/SI3/subfiles

Property svn:ignore

-                      old
+                      new
+*.aux
+*.bbl
+*.blg
+*.fdb*
+*.fls
+*.idx
+*.ilg
 *.ind
+*.ilg
+*.lo*
+*.out
+*.pdf
+*.pyg
+*.tdo
+*.toc
+*.xdv
+cache*

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/TOP/build

Property svn:ignore

-                      old
+                      new
 *.lo*
 *.out
+*.pdf
+*.pyg
+*.tdo
 *.toc
 *.xdv

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/TOP/main/bibliography.bib
- Property svn:eol-style set to native

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/doc/latex/TOP/subfiles

Property svn:ignore

-                      old
+                      new
+*.aux
+*.bbl
+*.blg
+*.fdb*
+*.fls
+*.idx
 *.ilg
 *.ind
+*.lo*
+*.out
+*.pdf
+*.pyg
+*.tdo
+*.toc
+*.xdv
+cache*

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: