-
Notifications
You must be signed in to change notification settings - Fork 9
CABLE Library for AM3/ACCESS3 #724
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
Merged
Merged
Changes from all commits
Commits
Show all changes
102 commits
Select commit
Hold shift + click to select a range
785febe
Rejig library config for AM3
Whyborn 5e0bd5a
Add library manifests to CI
Whyborn 5ea70cd
Add library manifests to CI
Whyborn 1bdd923
Set ref for spack-packages
Whyborn 3cb4057
Remove templates taken from spack-packages
Whyborn 329c302
Fix quotes
Whyborn 4a692ca
Misspelled matches
Whyborn 395b1fa
Move some files to common library
Whyborn d033810
Add type files to library
Whyborn f84c396
Fix some file names
Whyborn fea2e45
Fix more file names
Whyborn b5e9b4d
Drop coupled namelists mod
Whyborn 367ba2f
Add surface types mod
Whyborn 878632d
Fix name
Whyborn 114cf54
use new cable_surface_types_mod.F90
Whyborn cb6ac5c
Wrong end subroutine name
Whyborn 26c5d59
Add stash mapping
Whyborn 8b94bfb
Add ncpft back
Whyborn 6f9b9b0
Add dimension declaration
Whyborn 0bd7975
Remove CASA IO from library
Whyborn de283d4
Readd landuse
Whyborn 921abd5
Fix file name
Whyborn feb632b
Add cable_iovars.F90 to the build with slight adjustment
Whyborn dc432f7
Readd casa_inout
Whyborn 4813a19
Library now builds
Whyborn 911c2b3
Remove casa_variable.F90 from library
Whyborn f5662be
Add all the CASA types
Whyborn c6fe3e5
Update CASA types
Whyborn 8d4ebc6
Use new cable_surface_types_mod.F90
Whyborn 6d8f1a1
Fix dummy argument intents
Whyborn 2ebc5da
Accidental doubly defined argument
Whyborn a01f924
Fix typos
Whyborn 4d68181
Remove IFDEF statement
Whyborn 7a6d2e2
Remove duplicate files
Whyborn 3d0312a
Set ncpft
Whyborn a892c05
Remove coupled version of cable_surface_types
Whyborn 39fc220
Fix name error
Whyborn cd3747d
Update cable_user and CMakeLists.txt
Whyborn 1c1e944
Include ESM1.5 version of casa_landuse
Whyborn aaba5ca
Add missing file
Whyborn 4ec8c8f
Rejig library config for AM3
Whyborn 3235b1c
Add library manifests to CI
Whyborn 4179d4d
Add library manifests to CI
Whyborn 894a7bb
Remove templates taken from spack-packages
Whyborn 02a30fb
Fix quotes
Whyborn 4ae5a9a
Misspelled matches
Whyborn e094b8b
Move some files to common library
Whyborn d243577
Add type files to library
Whyborn dc2e041
Fix some file names
Whyborn 023a5f4
Fix more file names
Whyborn 4fb34ed
Drop coupled namelists mod
Whyborn 106cbc3
Add surface types mod
Whyborn 976c0d1
Fix name
Whyborn ac97bca
use new cable_surface_types_mod.F90
Whyborn c754e2c
Wrong end subroutine name
Whyborn 7ef5097
Add stash mapping
Whyborn 5e47793
Add ncpft back
Whyborn fe9b898
Add dimension declaration
Whyborn dcf009c
Remove CASA IO from library
Whyborn c93562d
Readd landuse
Whyborn c274767
Fix file name
Whyborn b9db7a2
Add cable_iovars.F90 to the build with slight adjustment
Whyborn 2df4cd6
Readd casa_inout
Whyborn 7c485cc
Library now builds
Whyborn 5fe937f
Remove casa_variable.F90 from library
Whyborn 3d5343c
Add all the CASA types
Whyborn 084d900
Update CASA types
Whyborn f845f2e
Use new cable_surface_types_mod.F90
Whyborn d8803a2
Fix dummy argument intents
Whyborn cd5f58f
Accidental doubly defined argument
Whyborn 0672feb
Fix typos
Whyborn 95c8a00
Remove IFDEF statement
Whyborn b9ba147
Remove duplicate files
Whyborn 3e2f3cf
Set ncpft
Whyborn 4f0d020
Remove coupled version of cable_surface_types
Whyborn 174ab43
Fix name error
Whyborn 79fdbd3
Update cable_user and CMakeLists.txt
Whyborn 595bce0
Include ESM1.5 version of casa_landuse
Whyborn 3ef0fed
Add missing file
Whyborn 2f78493
Update science
Whyborn 43bd6c6
ff pull
Whyborn e413350
Merge branch 'main' into make-AM3-library
Whyborn 7cd8286
Didn't fix the merge conflict properly
Whyborn ef8cdfd
Address PR feedback
Whyborn 4d4c117
Add files back to ESM1.6 library
Whyborn 9d5714e
Modify CI for ACCESS3
Whyborn f2acc72
File name typo in things moved to ESM1.6 lib
Whyborn 1003d02
Move cable_iovars.F90 to core library
Whyborn 713372e
Remove duplicate cable_iovars.F90
Whyborn 49435ab
Move type files to more logical location
Whyborn b6c0646
Remove all files that exist in the coupling code
Whyborn 85c8a86
Merge branch 'main' into make-AM3-library
Whyborn f11d99c
Move the ESM1.5 landuse file
Whyborn 0e72a98
Merge branch 'make-AM3-library' of github.com:CABLE-LSM/CABLE into ma…
Whyborn d7f4be8
Somehow the old CI manifests came back
Whyborn a9c3331
Add CI for UM in ACCESS3
Whyborn 360c0ae
Bad indenting
Whyborn 1f63ec5
Fix model variant spec
Whyborn 5a6d286
Try adding python dep
Whyborn 2548615
Add @ for compiler spec
Whyborn def2a99
For some reason this needs Python?
Whyborn 65214fb
Add +cable to um CI spec
Whyborn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
17 changes: 17 additions & 0 deletions
17
.github/build-ci/manifests/library-access3-gcc.spack.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| spack: | ||
| specs: | ||
| - cable@git.{{ ref }} ~mpi library=access3 | ||
|
|
||
| packages: | ||
| gcc: | ||
| require: | ||
| - '@{{ gcc_compiler_ver }}' | ||
|
|
||
| all: | ||
| require: | ||
| - '%access_gcc' | ||
| - 'target={{ target }}' | ||
|
|
||
| concretizer: | ||
| unify: false | ||
| view: false |
17 changes: 17 additions & 0 deletions
17
.github/build-ci/manifests/library-access3-intel.spack.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| spack: | ||
| specs: | ||
| - cable@git.{{ ref }} ~mpi library=access3 | ||
|
|
||
| packages: | ||
| intel-oneapi-compilers-classic: | ||
| require: | ||
| - '@{{ oneapi_compiler_classic_ver }}' | ||
|
|
||
| all: | ||
| require: | ||
| - '%access_intel' | ||
| - 'target={{ target }}' | ||
|
|
||
| concretizer: | ||
| unify: false | ||
| view: false |
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| spack: | ||
| specs: | ||
| - um@13.0 +cable model=vn13 um_ref="AM3-dev" jules_ref="AM3-dev" ukca_ref="AM3-2026.03.0" | ||
|
|
||
| packages: | ||
| cable: | ||
| require: | ||
| - '@git.{{ ref }}' | ||
| - '~mpi' | ||
| - 'library=access3' | ||
|
|
||
| python: | ||
| require: | ||
| - '@3.11.14' | ||
|
|
||
| intel-oneapi-compilers-classic: | ||
| require: | ||
| - '@{{ oneapi_compiler_classic_ver }}' | ||
|
|
||
| all: | ||
| require: | ||
| - '%access_intel' | ||
| - 'target={{ target }}' | ||
|
|
||
| view: false | ||
| concretizer: | ||
| unify: false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What happens to all these CASA files for the ESM1.6 library? Were they added but are in fact not needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately these are bits that had been rewritten for AM3- the way the derived types are structured is different to offline, see this JULES issue. This is related to the duplicate
ALLOCATABLE/POINTERtype definitions that I wanted to unify some time back. The AM3 versions of these live in the JULES src/util/casa.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think I follow what you are saying. So these files are not the same between ESM1.6 and AM3, ok. But it does not explain what happens for these files for ESM1.6. Right now, these files completely disappear of the compilation of ESM1.6 library in this PR, making me doubt that the compilation of the ESM1.6 library would work..
At the same time, I'm pretty sure we said this version of CABLE won't be compatible with ESM1.6, so should we not include an ESM1.6 library in the CMakeLists.txt file?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yea, I think its either:
With the conversations around BLAZE ongoing, I think it would be wise to keep the ESM1.6 library code there and add the files. I don't think it would be much work to make the ESM1.6 library build again, but keeping the list of files up to date would make future life easier if someone else was to come work on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, when you have time, can you look at making sure the ESM1.6 library works. Can it also be added to the compilation CI in CABLE's PRs then so we would do 2 library builds?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can I make that a separate PR? Separate that work from the AM3 work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we keep the files in the list then so that it's easier to identify these files are problematic for the work on ESM1.6? Or comment them out with enough explanation to know what's needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't leave them in the list uncommented, as the build with fail, but I think commenting them out with an explanation is a good idea.