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

Feat/awicm3.2 #1056

Merged
merged 35 commits into from
Oct 19, 2023
Merged

Feat/awicm3.2 #1056

merged 35 commits into from
Oct 19, 2023

Conversation

JanStreffing
Copy link
Contributor

This merge brings AWI-CM3 v3.2 (https://awi-cm3-documentation.readthedocs.io/en/latest/releases.html#awi-cm3-v3-2) to the esm_tools release branch

Copy link
Contributor

@mandresm mandresm left a comment

Choose a reason for hiding this comment

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

Hi @JanStreffing, nice PR!

I have some comments about information duplication in awicm3.yaml. Other than that there are a bunch of new namelists in namelists/fesom2/2.0/awicm3/v3.2 and another set in namelists/fesom2/2.5/awicm3/v3.2. Is this intentional? I would think that you just wanted the ones of fesom 2.5.

configs/setups/awicm3/awicm3.yaml Outdated Show resolved Hide resolved
configs/setups/awicm3/awicm3.yaml Outdated Show resolved Hide resolved
configs/setups/awicm3/awicm3.yaml Outdated Show resolved Hide resolved
configs/setups/awicm3/awicm3.yaml Show resolved Hide resolved
configs/setups/awicm3/awicm3.yaml Show resolved Hide resolved
configs/setups/awicm3/awicm3.yaml Show resolved Hide resolved
configs/setups/awicm3/awicm3.yaml Show resolved Hide resolved
@JanStreffing JanStreffing changed the title Feat/awicm3.2 Draft: Feat/awicm3.2 Sep 21, 2023
@JanStreffing
Copy link
Contributor Author

Question:
I'm trying to use the new fesom2.5.yaml. like this:

in awicm3.yaml:

fesom:
        version: "2.0"
        choose_general.major_version:
                "v3.2":
                        add_version: "2.5"

Is this the right way? In the finished yaml I still get:

    debug_info:
        loaded_from_file: /home/a/a270092/esm_tools/configs//components/fesom/fesom-2.0.yaml
    destination: fesom-2.0

@mandresm
Copy link
Contributor

Question: I'm trying to use the new fesom2.5.yaml. like this:

in awicm3.yaml:

fesom:
        version: "2.0"
        choose_general.major_version:
                "v3.2":
                        add_version: "2.5"

Is this the right way? In the finished yaml I still get:

    debug_info:
        loaded_from_file: /home/a/a270092/esm_tools/configs//components/fesom/fesom-2.0.yaml
    destination: fesom-2.0

I don't think so, in principle, it should be possible to run it without the add, but there is a problem there, and it's being there for a while (sorry...). What I've tipically done in this case is to include all the versions in the choose and not define one default one. But this might not work either, at least for esm_master. I'll try to have a look at a solution this afternoon.

@mandresm
Copy link
Contributor

I can confirm that there is a bug here. I am half way of finding out what's going on, but I'm in a conference, so I'll be slower than usual.

@JanStreffing
Copy link
Contributor Author

Thanks for digging!

@mandresm
Copy link
Contributor

Hi @JanStreffing,

I have managed to fix the problems with the version switching... the functions affected by the bugs were written by me on my early days of ESM-Tools :)

You'll find the fixes in the branch fix/recursive_resolution_of_early_variables_and_fix_find_key. You can just merge that branch here (just departed from release) or cherry-pick the single commit 3028599d2a27fdec65cba2e4c0f498eaafdec544 because I don't think the PR (#1063) will be reviewed earlier than Wednesday.

The failed tests in #1063 shouldn't be a problem.

@JanStreffing
Copy link
Contributor Author

ready to merge 🍻

@JanStreffing JanStreffing changed the title Draft: Feat/awicm3.2 Feat/awicm3.2 Oct 18, 2023
@JanStreffing
Copy link
Contributor Author

Halt! one more fix...

@JanStreffing JanStreffing changed the title Feat/awicm3.2 Draft: Feat/awicm3.2 Oct 18, 2023
@JanStreffing JanStreffing changed the title Draft: Feat/awicm3.2 Feat/awicm3.2 Oct 18, 2023
@JanStreffing
Copy link
Contributor Author

done

@mandresm
Copy link
Contributor

Are you aware of this changes in the namcouple of the frontiers version?

https://github.com/esm-tools/esm_tools/actions/runs/6572115118/job/17852600385?pr=1056#step:8:395

@JanStreffing
Copy link
Contributor Author

I was not! I'll fix that.

@mandresm
Copy link
Contributor

I'm adding a test runscript to the CI for the 3.2 version and doing a real test in Levante. Should I perform the real test somwhere else? (that won't delay the merge, and I'll do it between today and tomorrow)

@JanStreffing
Copy link
Contributor Author

i think it's a good idea to do a test on juwels as well. We might not have albedo yet, correct?

@mandresm
Copy link
Contributor

i think it's a good idea to do a test on juwels as well. We might not have albedo yet, correct?

Albedo is something for next week. I'm running the tests on Levante. I'll do the same on Juwels now that all is configured in esm_tests. Tomorrow I can do the same in Aleph.

@JanStreffing
Copy link
Contributor Author

great 👍 :

@mandresm
Copy link
Contributor

#approve-changes

Add the installation of Hub CLI for the pre-merge GitHub actions workflow
@mandresm
Copy link
Contributor

#bump

configs/setups/awicm3/awicm3.yaml Outdated Show resolved Hide resolved
@mandresm mandresm merged commit 14bab3f into release Oct 19, 2023
@mandresm mandresm deleted the feat/awicm3.2 branch October 19, 2023 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awicm enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants