Merge branch 'branch_4.2' into 'mbell-main-patch-36614' (a18b9195) · Commits · Consortium Members / UKMO / GOSI / GOSI9esm · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

GOSI9esm
- Activity
- Members
- Terraform modules

Snippets Groups Projects

a18b9195

Commit a18b9195 authored 2 years ago by Nicolas Martin

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'branch_4.2' into 'mbell-main-patch-36614'

# Conflicts:
#   README.rst

parents e6f91902 2aea4e72

No related branches found

No related tags found

No related merge requests found

Changes 257

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 0 additions, 78 deletions

CHANGES.md
CONTRIBUTING.rst 0 additions, 73 deletions

CONTRIBUTING.rst
INSTALL.rst 0 additions, 270 deletions

INSTALL.rst
README.rst 73 additions, 61 deletions

README.rst
REFERENCES.bib 0 additions, 53 deletions

REFERENCES.bib
arch/CMCC/arch-X64_ZEUS.fcm 2 additions, 2 deletions

arch/CMCC/arch-X64_ZEUS.fcm
arch/CNRS/arch-X64_IRENE.fcm 1 addition, 1 deletion

arch/CNRS/arch-X64_IRENE.fcm
arch/CNRS/arch-X64_IRENE_DEBUG.fcm 1 addition, 1 deletion

arch/CNRS/arch-X64_IRENE_DEBUG.fcm
arch/CNRS/arch-X64_IRENE_GCC.fcm 1 addition, 1 deletion

arch/CNRS/arch-X64_IRENE_GCC.fcm
arch/CNRS/arch-X64_IRENE_GCC_DEBUG.fcm 1 addition, 1 deletion

arch/CNRS/arch-X64_IRENE_GCC_DEBUG.fcm
arch/CNRS/arch-X64_JEANZAY.fcm 1 addition, 1 deletion

arch/CNRS/arch-X64_JEANZAY.fcm
arch/CNRS/arch-X64_JEANZAY_DEBUG.fcm 1 addition, 1 deletion

arch/CNRS/arch-X64_JEANZAY_DEBUG.fcm
arch/MERCATOR/arch-X64_KARA_GCC_OMPI_DEBUG.fcm 1 addition, 1 deletion

arch/MERCATOR/arch-X64_KARA_GCC_OMPI_DEBUG.fcm
arch/NOC/arch-X86_ARCHER2-Gnu_DEBUG.fcm 62 additions, 0 deletions

arch/NOC/arch-X86_ARCHER2-Gnu_DEBUG.fcm
arch/arch-linux_gfortran.fcm 11 additions, 12 deletions

arch/arch-linux_gfortran.fcm
arch/arch-osx_gfortran.fcm 2 additions, 2 deletions

arch/arch-osx_gfortran.fcm
arch/arch-osx_gfortran_debug.fcm 1 addition, 1 deletion

arch/arch-osx_gfortran_debug.fcm
cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml 0 additions, 1 deletion

cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml
cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg 7 additions, 2 deletions

cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg
cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg 6 additions, 1 deletion

cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg

with 171 additions and 563 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment