add new awiesm version awiesm-2.6 for fesom-2.6 #1235
Merged
Conversation
This file contains 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
pgierz
approved these changes
Oct 25, 2024
couplings/echam/env_echam.py
Outdated
| @@ -27,7 +27,7 @@ def prepare_environment(config): | |||
| "MACHINE": config["computer"]["name"], | |||
| "MESH_PATH_FESOM": config["fesom"]["mesh_dir"], | |||
| "HOSING_FILE_LANDICE_LOSS": config["fesom"].get("fwf_path", config["general"]["experiment_couple_dir"]), | |||
| "HOSING_CORRECTION": config["echam"].get("hosing_correction", 0), # LA: Not needed anymore with Lu's ECHAM gfw fix | |||
| "HOSING_CORRECTION": int(config["echam"].get("hosing_correction", False)), # LA: Not needed anymore with Lu's ECHAM gfw fix | |||
There was a problem hiding this comment.
What is the gfw fix? Just out of curiosity...
There was a problem hiding this comment.
It`s the "gfw_to_ocean" implementation. But this global "hosing" is still necessary to account for the correct ocean salinity
There was a problem hiding this comment.
It might be good to use the Click library for this one, that way we can integrate the functionality into the global command line interface. See the upcoming redesign in #1232
Sounds great! Thank you! |
|
Build fails for I'm looking into it. |
Does @JanStreffing has got similar issues? |
Did not try building on albedo, sorry. |
|
@pgierz Did you have a look at the compile issue on Albedo? I get the same error for AWI-ESM-2.6, but AWI-ESM-2.1 works fine |
|
I haven't had time to look in detail yet. I guess the CMakeLists in FESOM changed quite extensively between the one for AWIESM 2.1 and AWIESM 2.6.
|
Do you maybe have an idea about this, @sebastianbeyer or @mandresm ? |
|
Alright, I have a In the main CMakeLists.txt of OASIS, under lib/psmile set(all_headers ${src_home}/include)
if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
- set(OASIS_FFLAGS -ansi_alias -fp-model precise -no-fast-transcendentals)
+ set(OASIS_FFLAGS -ansi-alias -fp-model precise -no-fast-transcendentals -fPIC)
endif()
# depends on the mct libraryRebuild oasis, then fesom. Linking works. |
I just checked the oasis3mct.env.yaml. Is there a particular reason why this flag is set for levante and juwels but not for albedo? |
|
Hey :) I do not completely understand what's going on here, but my guess would be that we changed the way we build fesom to use PIC and that requires that other libraries that are linked together now do also required PIC now (PIC shared libraries can only be created from PIC objects). I am not sure if FESOM was previously built without PIC... |
No, I guess I forgot to initially include it. Go ahead and add it to this PR, that would mean that we don't need to modify OASIS directly in the source code, which I would be happy about |
As I understand, the OASIS_FFLAGS are overwritten in the CMakeLists when using an Intel compiler so it does not make any difference if the glafs are changed with the esm_tools |
I created a PR in the oasis repository now |
Works now for me with the updated oasis version |
mandresm
approved these changes
Nov 8, 2024
|
I said #bump ! |
|
#approve-changes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I named the new awiesm version now "AWIESM-2.6" as a lot of development happened since awiesm-2.1 and all features are now included in one common version: wiso, icebergs, ice sheet coupling, cavities, recom, tracer
I tested for icebergs and cavities. Please check if anything needs to be added for other features.