Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add v4.2.0, generalise COMPONENTS (i.e. OPA/TOP) and CPP_KEYS #37

Draft
wants to merge 57 commits into
base: main
Choose a base branch
from

Conversation

jpolton
Copy link

@jpolton jpolton commented Mar 22, 2023

Done: Edits to add 4.2.0 via gitlab repo.

WIP: add multiple words to variable definitions in NEMO_in that can be passed to setup_nemo
E.g. this would be ideal

MY_SRC=                        # If blank no need to do anything
NEMO_VERSION=4.2.0             # Check that VERSION is 4.0.[2-6], 4.0_HEAD or trunk (all svn), or 4.2.0 (gitlab)
...
COMPONENTS="NEMO OCE"          # Which NEMO components to build OCE/ICE/TOP etc. Enter as list with spaces following (optional) cfg name, E.g. 'CFG_NAME OCE TOP'
CPP_KEYS="key_diainstant key_xios key_qco"     # Any additional compiler keys to include? E.g. from 4.2.x

In practise can not find a way to add multiple entries (e.g. key_diainstant AND key_xios) to a variable :-(

NB these two changes can not really be separated as the cpp_keys change with 4.2.0

@jpolton jpolton requested a review from jdha March 22, 2023 10:05
@@ -151,8 +162,10 @@ case "${NEMO_VER}"
;;
trunk) svn co http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5@1964 xios
;;
4.2.0) svn co http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5@1964 xios
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't use 2.5 ... use something like the following I've added for JMMP/CO_AMM7_4.2:
4.2) svn checkout http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk@2379 xios
;;
4.2.0) svn checkout http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk@2379 xios

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fixed the namelist reading issues in this branch/PR.
I've left the NEMO / XIOS version edits alone (though reverting to main would help with the merging), pending @jdha modifications already explored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants