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

Towards WCDA: Introduce geos_marine, keep geos_ocean #370

Merged
merged 38 commits into from
Jul 22, 2024

Conversation

Dooruk
Copy link
Collaborator

@Dooruk Dooruk commented Jun 24, 2024

This introduces geos_marine as a 3rd model interface and allows assimilating ocean and sea-ice data (first proper Weakly-Coupled DA with SWELL!). geos_marine will eventually replace geos_ocean but we can keep it around for now while we figure out ocean-only DA vs. marine DA changes. So that creates a lot of code duplication in terms of observation YAMLs under geos_ocean and geos_marine but that is temporary.

Some highlights:

  • GEOSgcm version is bumped to v11.6.0, which required some changes in terms of Boundary Conditions linking.
  • We switched from using CICE4 to CICE6. As far as SWELL is concerned, this is a one line change in run_geos_executable as we point to the external GEOS builds and experiment directories.
  • Introduced the new task SOCA2CICE variable change, which should only be active in flow.cylc while the sea-ice DA is active.
  • SOCA is designed to handle different model types (ocean, sea-ice, BGC, waves), hence some of the configuration creation will depend on if these models are turned on or off. This is a longer term consideration but an important one as combinations of different model types are concerned.
  • Some minor EVA related changes, mainly concerning projections for sea-ice related plots.
  • Introduces --no-requeue #SBATCH option to prevent Cylc tasks from resubmitting jobs and "spreading" to other compute nodes.

Closes the following:

@Dooruk Dooruk changed the title (Draft) Step 1: Introduce geos_marine, keep geos_ocean Step 1: Introduce geos_marine, keep geos_ocean Jun 27, 2024
@Dooruk Dooruk linked an issue Jun 27, 2024 that may be closed by this pull request
Copy link
Collaborator

@ashiklom ashiklom left a comment

Choose a reason for hiding this comment

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

I had a few minor comments on the Python implementation, but I'm not equipped (yet) to comment on the YAML configs that are the bulk of this PR or the science behind them. I'll have to defer to somebody with a better understanding of JEDI for that.

@Dooruk Dooruk linked an issue Jul 18, 2024 that may be closed by this pull request
@Dooruk
Copy link
Collaborator Author

Dooruk commented Jul 18, 2024

I had a few minor comments on the Python implementation, but I'm not equipped (yet) to comment on the YAML configs that are the bulk of this PR or the science behind them. I'll have to defer to somebody with a better understanding of JEDI for that.

Thanks for reviewing this PR. I'm the only one exercising the cyling GEOS+SOCA capability currently so I added geos_marine as a first step. Hopefully in the second step (another PR) when I take geos_ocean out David can test it to make sure ocean-only DA still works.

@Dooruk Dooruk requested a review from ashiklom July 18, 2024 19:43
Copy link
Collaborator

@asewnath asewnath left a comment

Choose a reason for hiding this comment

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

Just some comments related to a bug found when building swell experiments with the CLI

@Dooruk Dooruk requested a review from asewnath July 19, 2024 16:33
@Dooruk
Copy link
Collaborator Author

Dooruk commented Jul 22, 2024

I am going to merge this to move forward with the FMS updates.

@Dooruk Dooruk merged commit 80c6406 into develop Jul 22, 2024
9 of 11 checks passed
@Dooruk Dooruk deleted the feature/CICE6/marine_3dvar_with_ice branch July 22, 2024 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants