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.

Sign up for GitHub

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

Jump to bottom

move dycore stencils to sub packages stencils #595

Merged
merged 14 commits into from
Nov 19, 2024
Merged

move dycore stencils to sub packages stencils #595

merged 14 commits into from
Nov 19, 2024

Conversation

halungge
Copy link
Contributor

@halungge halungge commented Nov 14, 2024 •
edited
Loading

Clean up dycore package of icon4py repository:

  • move stencils in icon4py.model.atmosphere.dycore to a stencils sub package
  • remove sub packages velocity solve_nonhyrdo and states in dycore

additional changes

  • fix typos in stencil naming convention.
  • remove an import from dycore in common/tests

@halungge
Copy link
Contributor Author

cscs-ci run default

@halungge
Copy link
Contributor Author

cscs-ci run default

@halungge
fix imports in driver
6d40294 
remove illegal import in common/tests
@halungge
fix tools tests
d77c85f 
sts
@halungge
Copy link
Contributor Author

cscs-ci run default

1 similar comment
@halungge
Copy link
Contributor Author

cscs-ci run default

@halungge
Copy link
Contributor Author

cscs-ci run default

halungge
halungge commented Nov 15, 2024
View reviewed changes
model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/dycore_states.py
@@ -39,9 +40,9 @@ class DiagnosticStateNonHydro:
ddt_w_adv_ntl2: fa.CellKField[float]

# Analysis increments
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For the JW case those are initialized with None. So I patched the type annotation.

@halungge
Copy link
Contributor Author

cscs-ci run default

@halungge
Copy link
Contributor Author

cscs-ci run default

@halungge
Copy link
Contributor Author

cscs-ci run default

egparedes
egparedes approved these changes Nov 15, 2024
View reviewed changes
Copy link
Contributor

@egparedes egparedes left a comment

Choose a reason for hiding this comment

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

LGTM. Do you already know if it works properly with the blue line?

model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py Outdated Show resolved Hide resolved
model/common/tests/metric_tests/test_metric_fields.py
@@ -283,7 +280,7 @@ def test_compute_d2dexdz2_fac_mc(icon_grid, metrics_savepoint, grid_savepoint, b
del_t_bg=del_t_bg,
h_scal_bg=h_scal_bg,
igradp_method=3,
igradp_constant=HorizontalPressureDiscretizationType.TAYLOR_HYDRO,
igradp_constant=3,
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a question: why inlining the constant value here instead of the previous approach?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because it the enum is defined in dycore. I don't know why tach did not capture this. Because it is in tests and we only check the src folders?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that looks like the most likely reason.

@halungge
Copy link
Contributor Author

LGTM. Do you already know if it works properly with the blue line?

It looks to me as there is no CI in the blueline currently... It is this icon-exclaim PR

@halungge @egparedes
Update model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py
9e25c65 
Co-authored-by: Enrique González Paredes <enriqueg@cscs.ch>
@halungge halungge marked this pull request as ready for review November 15, 2024 09:55
@halungge
Copy link
Contributor Author

cscs-ci run default

@github-actions GitHub Actions
Copy link

Mandatory Tests

Please make sure you run these tests via comment before you merge!

  • cscs-ci run default
  • launch jenkins spack

Optional Tests

To run benchmarks you can use:

  • cscs-ci run benchmark

To run tests and benchmarks with the DaCe backend you can use:

  • cscs-ci run dace

In case your change might affect downstream icon-exclaim, please consider running

  • launch jenkins icon

For more detailed information please look at CI in the EXCLAIM universe.

@halungge
Copy link
Contributor Author

cscs-ci run default

@halungge
Copy link
Contributor Author

launch jenkins spack

@halungge halungge merged commit bac96a5 into main Nov 19, 2024
3 of 5 checks passed
jcanton pushed a commit that referenced this pull request Nov 20, 2024
@halungge @egparedes @jcanton
move dycore stencils to sub packages stencils (#595)
fcd808a 
* move dycore stencils to sub packages stencils
---------

Co-authored-by: Enrique González Paredes <enriqueg@cscs.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@egparedes egparedes egparedes approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@halungge @egparedes