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

Allow multipe field operators in program, pass array sizes to bindings gen, integrate fused vel_adv 1_to_7 and 8_to_13 #261

Merged
merged 212 commits into from
Feb 8, 2024
Merged

Allow multipe field operators in program, pass array sizes to bindings gen, integrate fused vel_adv 1_to_7 and 8_to_13 #261

Show file tree
Hide file tree
Changes from 201 commits
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
d96726f
Add model
samkellerhals Jun 1, 2023
349eed3
Fix import paths
samkellerhals Jun 1, 2023
b96eb89
Add precommit config files
samkellerhals Jun 1, 2023
cf94837
Modify tox config
samkellerhals Jun 1, 2023
aa6b9d0
Update github workflows
samkellerhals Jun 2, 2023
e194978
Update icon4py qa workflow
samkellerhals Jun 2, 2023
866a057
add working directory
samkellerhals Jun 2, 2023
1a55ffc
more changes
samkellerhals Jun 2, 2023
8e1f16a
Pass config file to flake8
samkellerhals Jun 2, 2023
d3450c8
Update flake8 path
samkellerhals Jun 2, 2023
bf96c79
run formatting
samkellerhals Jun 2, 2023
7fa799a
Update pyproject.toml
samkellerhals Jun 2, 2023
11882e6
Allow coverage to fail if no report is available
samkellerhals Jun 5, 2023
b4380dc
Use working directory only for install job
samkellerhals Jun 6, 2023
a34490e
Update model/atm_dyn_iconam/pyproject.toml
samkellerhals Jun 6, 2023
c146d24
Update model/common/pyproject.toml
samkellerhals Jun 6, 2023
71b832f
Reformat
samkellerhals Jun 6, 2023
232b8b8
Add version for atm_dyn_iconam and common
samkellerhals Jun 6, 2023
65c0cff
Add qa to common
samkellerhals Jun 6, 2023
68bf4de
Update model/atm_dyn_iconam/tox.ini
samkellerhals Jun 6, 2023
2b76771
Update model/common/tox.ini
samkellerhals Jun 6, 2023
a87227e
Update model/common/tox.ini
samkellerhals Jun 6, 2023
e59ff17
add icon4py model qualified name
samkellerhals Jun 6, 2023
eac0e5c
Add icon4py-common to github workflows
samkellerhals Jun 6, 2023
d8cfc9a
Reformat
samkellerhals Jun 6, 2023
61632b3
Remove PIP_SRC
samkellerhals Jun 6, 2023
3d27334
Allow pytest to fail in icon4py.model.common
samkellerhals Jun 6, 2023
dc1a42b
Update .github/workflows/icon4py-qa.yml
samkellerhals Jun 7, 2023
3b2dff5
Update .github/workflows/icon4py-qa.yml
samkellerhals Jun 7, 2023
aab2be0
Update .github/workflows/icon4py-tox.yml
samkellerhals Jun 7, 2023
9c86bb5
Add missing files
samkellerhals Jun 7, 2023
c33623e
Merge branch 'refactor-icon4py-model' of github.com:C2SM/icon4py into…
samkellerhals Jun 7, 2023
c50030b
Add license header
samkellerhals Jun 7, 2023
1276238
Fixes
samkellerhals Jun 8, 2023
d8eb7f9
Cleanup
samkellerhals Jun 9, 2023
ca0b4ef
Reformat
samkellerhals Jun 9, 2023
e57831a
Run precommit again
samkellerhals Jun 9, 2023
219aff5
Resolve conflicts
samkellerhals Jul 12, 2023
ba936b1
Introduce testutils package in common
samkellerhals Jul 13, 2023
ec038f6
Rename atm_dyn_iconam to model.atmosphere.dycore
samkellerhals Jul 13, 2023
75c1497
Rename atm_dyn_iconam to model.atmosphere.dycore
samkellerhals Jul 13, 2023
0e4ac2f
Update Github Actions
samkellerhals Jul 13, 2023
b0da32e
Trigger action on pr edit
samkellerhals Jul 13, 2023
357962b
Run precommit
samkellerhals Jul 13, 2023
f7c94a1
Run precommit for tools
samkellerhals Jul 13, 2023
aa41b04
Update bumpversion
samkellerhals Jul 13, 2023
af27a45
mo_velocity_advection_stencil_02
samkellerhals Jul 14, 2023
039507c
mo_velocity_advection_stencil_03
samkellerhals Jul 14, 2023
8657dfd
mo_velocity_advection_stencil_06
samkellerhals Jul 14, 2023
2d6858b
mo_velocity_advection_stencil_10
samkellerhals Jul 14, 2023
f4d1e07
Add more benchmarks
samkellerhals Jul 17, 2023
5a0a150
Add calculate nabla2 of theta
samkellerhals Jul 17, 2023
4fd4222
Add test_calculate_nabla4
samkellerhals Jul 17, 2023
2a425b8
Add TestCalculateNabla2AndSmagCoefficientsForVn
samkellerhals Jul 17, 2023
a5752c5
Add mo_advection_traj_btraj_compute_o1_dsl
samkellerhals Jul 18, 2023
656bbe0
Add mo_solve_nonhydro_stencil_16_fused_btraj_traj_o1
samkellerhals Jul 18, 2023
474faa5
Put velocity advection into 4 fused stencils
muellch Aug 8, 2023
c40f0a9
Resolve conflicts and failing tests
samkellerhals Aug 10, 2023
5ba5a16
Remove redundant files
samkellerhals Aug 10, 2023
f56ba4c
Remove tox ini in dycre
samkellerhals Aug 10, 2023
d653858
Add root tox.ini back
samkellerhals Aug 10, 2023
e9b58ed
Add numpy tests for turbulence fused diffusion stencil, not yet verif…
muellch Aug 10, 2023
9f865a0
Add incomplete numpy tests to three more fused diffusion stencils
muellch Aug 10, 2023
40950ec
Do not hardcode reshapes
samkellerhals Aug 11, 2023
3ffb724
Merge branch 'main' into fused_velocity_advection
muellch Aug 11, 2023
e999286
Merge remote-tracking branch 'origin/benchmark-more-tests' into fused…
muellch Aug 14, 2023
8dc502c
add C2CEC nbh offset provider to simple_mesh.py
muellch Aug 14, 2023
6e163f7
Fixed "name" of vn in test
muellch Aug 15, 2023
97cf2fa
Fix name of field operator for fused vel 1 to 7
muellch Aug 15, 2023
f7cfe26
Adapted all fused vel adv stencils to new repo layout
muellch Aug 15, 2023
31810f0
Add numpy unit tests for fused vel adv stencils, no reference yet
muellch Aug 16, 2023
0a04735
Added generation of size arguments to bindings gen - draft
muellch Aug 24, 2023
7c5a8ce
Fix run_ call in .cpp file to also take the k_size argument
muellch Aug 30, 2023
338b6b4
Merge branch 'main' into fused_velocity_advection
muellch Sep 12, 2023
d96e0bc
First version of new handling of compute domain
muellch Sep 14, 2023
0b363ba
Merge branch 'main' into array_size_bindings
muellch Sep 14, 2023
c3f7992
Fixed fused 11_12
muellch Sep 14, 2023
84ac0c2
hacking on the multi fieldop (#272)
havogt Sep 14, 2023
d3fbcd6
Fixed condition when to overwrite domain arguments
muellch Sep 15, 2023
d649225
Fixes for domain size arguments
muellch Sep 18, 2023
59ddafc
Merge branch 'array_size_bindings' into fused_velocity_advection
muellch Sep 18, 2023
a63beb7
Start reference impl for velocity_advection_stencil_15_to_18
samkellerhals Sep 29, 2023
197ae0e
Sync with main
samkellerhals Oct 2, 2023
5e86c09
Fix issues with main sync
samkellerhals Oct 2, 2023
10a4313
Fix call to mo_velocity_advection_14
samkellerhals Oct 2, 2023
b51e6fa
Formatting, start reference for apply_diffusion_to_w_and_compute_hori…
samkellerhals Oct 2, 2023
86c85a8
Run precommit
samkellerhals Oct 2, 2023
bb6e2e5
Use correct bounds
samkellerhals Oct 3, 2023
1c8ca1e
rewrite 15_to_18
samkellerhals Oct 3, 2023
217caa9
Add apply_diffusion_to_vn reference
samkellerhals Oct 3, 2023
62d82c2
Fix velocity_advection_15_to_18
samkellerhals Oct 3, 2023
a309f4c
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Oct 3, 2023
0440543
get missing file
huppd Oct 3, 2023
2b9dd5b
Add mo_velocity_advection_stencil_1_to_7 reference impl
samkellerhals Oct 4, 2023
93a9d68
Implement reference TestApplyDiffusionToThetaAndExner
samkellerhals Oct 4, 2023
a730268
Add numpy impl for fused_velocity_advection_stencil_19_to_20
samkellerhals Oct 5, 2023
2b9d826
add velocity_advection 8 to 14
samkellerhals Oct 5, 2023
9558787
Merge remote-tracking branch 'origin/fused_velocity_advection' into f…
huppd Oct 5, 2023
c01ed83
fix bounds
huppd Oct 5, 2023
7ed305c
homogenize bounds
huppd Oct 5, 2023
6a7a308
homogenize bounds
huppd Oct 5, 2023
6adf134
fix test
huppd Oct 6, 2023
67ba17e
fix test
huppd Oct 6, 2023
3f37bf0
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Oct 6, 2023
2fdbf8e
rename vert_idx to k
huppd Oct 6, 2023
96fd026
change horz to edge
huppd Oct 6, 2023
57b1d44
Revert "rename vert_idx to k"
huppd Oct 6, 2023
58873a6
update names
huppd Oct 6, 2023
d8a9515
refactor name
huppd Oct 6, 2023
8e2b4d8
fix typo
huppd Oct 6, 2023
9a2626b
rename horz/vert
huppd Oct 9, 2023
93b140b
rename horz/vert
huppd Oct 9, 2023
151b87f
Merge branch 'fused_velocity_advection_hud' of github.com:C2SM/icon4p…
huppd Oct 9, 2023
1a2445d
fix names
huppd Oct 9, 2023
4bf73b9
turbulance -> turbulence
muellch Oct 9, 2023
d77c774
Fix order of arguments
muellch Oct 9, 2023
40aba1d
fix utest liksov
huppd Oct 10, 2023
7177146
polish
huppd Oct 10, 2023
c2825cd
Merge branch 'main' into fused_velocity_advection
muellch Oct 9, 2023
1a1ac6f
update names
huppd Oct 10, 2023
edeac69
styel
huppd Oct 11, 2023
859826f
style
huppd Oct 11, 2023
6c238db
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Oct 16, 2023
520f7e6
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Oct 16, 2023
a7af07c
add __init__
huppd Oct 16, 2023
c2254ac
fix stencil_tests
huppd Oct 16, 2023
ee68ffb
Merge branch 'main' into fused_velocity_advection
muellch Oct 16, 2023
1d59633
fix diffusion tests
huppd Oct 16, 2023
bc4f1ab
fix more diffustion
huppd Oct 16, 2023
d798cdb
rerefactor
huppd Oct 16, 2023
6760b51
rerefactor
huppd Oct 17, 2023
5e78dea
more fixes
huppd Oct 17, 2023
7083b05
next fix
huppd Oct 18, 2023
ce39e8f
another small fix
huppd Oct 18, 2023
c25a92d
style
huppd Oct 18, 2023
5bc7bea
update
huppd Oct 18, 2023
0b77052
fix
huppd Oct 18, 2023
ceb1acc
Merge branch 'fused_velocity_advection_hud' of github.com:C2SM/icon4p…
huppd Oct 18, 2023
4180570
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Oct 23, 2023
506585a
Update model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_…
huppd Nov 2, 2023
27518a7
Update model/atmosphere/dycore/tests/dycore_stencil_tests/test_mo_vel…
huppd Nov 2, 2023
86b6489
Update model/atmosphere/dycore/tests/dycore_stencil_tests/test_mo_vel…
huppd Nov 2, 2023
3644439
Update model/atmosphere/dycore/tests/dycore_stencil_tests/test_mo_vel…
huppd Nov 2, 2023
3bf7955
Update model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_…
huppd Nov 2, 2023
519ccb5
Update model/atmosphere/dycore/tests/dycore_stencil_tests/test_mo_vel…
huppd Nov 2, 2023
aa740a9
Update model/atmosphere/dycore/tests/dycore_stencil_tests/test_mo_vel…
huppd Nov 2, 2023
6163cc8
fix if-statements
huppd Nov 2, 2023
4fc5433
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Nov 2, 2023
6bb84b4
pre-commit
huppd Nov 2, 2023
1b639e4
Merge branch 'main' into array_size_bindings
muellch Nov 3, 2023
fde814f
Move tests in correct folders
muellch Nov 3, 2023
e0d6577
revert
huppd Nov 8, 2023
f2a2ccc
Merge branch 'fused_velocity_advection_hud' of github.com:C2SM/icon4p…
huppd Nov 8, 2023
ceee6b0
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Nov 9, 2023
cb685b7
pre-commit
huppd Nov 9, 2023
95b29fa
update style
huppd Nov 9, 2023
2d27344
fix tests
huppd Nov 10, 2023
ea3086f
rm doublication
huppd Nov 10, 2023
3361388
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Nov 10, 2023
a499e26
FInished 1_to_7 and 8_to_13
muellch Nov 16, 2023
c1180a0
Removed k_size from setup in bindings gen, edited fused stencils and …
muellch Nov 16, 2023
acb14c9
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Nov 23, 2023
5727f34
update style
huppd Nov 23, 2023
b6f2f8b
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Nov 27, 2023
735bfbe
Merge branch 'fused_velocity_advection_hud' of github.com:C2SM/icon4p…
huppd Nov 27, 2023
3161170
fix style
huppd Nov 27, 2023
d4cf86e
fix spelling
huppd Nov 27, 2023
cf07aa7
Merge branch 'fused_velocity_advection_hud' of github.com:C2SM/icon4p…
huppd Nov 27, 2023
9375d37
try
huppd Nov 27, 2023
4e9a5e5
increase timelimit
huppd Nov 27, 2023
34464c8
revert try
huppd Nov 28, 2023
ce89d6f
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Nov 29, 2023
382c570
fix
huppd Nov 29, 2023
ef05348
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Nov 30, 2023
6c8a385
Update model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_…
huppd Nov 30, 2023
bf07116
Update model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_…
huppd Nov 30, 2023
f56a823
Update model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_…
huppd Nov 30, 2023
7b77a39
Update model/atmosphere/dycore/tests/dycore_stencil_tests/test_fused_…
huppd Nov 30, 2023
1085c1f
Update model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_…
huppd Nov 30, 2023
a8cc7af
Update model/atmosphere/diffusion/tests/diffusion_stencil_tests/test_…
huppd Nov 30, 2023
300f997
fix ws
huppd Nov 30, 2023
b91f810
Refactor 1_to_7
muellch Nov 30, 2023
6aac3bc
Merge branch 'main' into array_size_bindings
muellch Dec 1, 2023
547d4d3
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Dec 1, 2023
6ee58db
use indices_field
huppd Dec 1, 2023
0df67e8
add mixed precision
huppd Dec 1, 2023
7c19330
more mixed precision
huppd Dec 1, 2023
b8e5b99
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Dec 1, 2023
6071316
fix numbering
huppd Dec 5, 2023
14ccb60
fix style
huppd Dec 5, 2023
11a633f
fix style
huppd Dec 5, 2023
d404dd2
fix style
huppd Dec 5, 2023
71e9753
fix style
huppd Dec 5, 2023
e8da92c
Merge remote-tracking branch 'origin/main' into fused_velocity_advect…
huppd Dec 5, 2023
b2bebed
Merge branch 'fused_velocity_advection_hud' into array_size_bindings
muellch Dec 6, 2023
5ab6173
Merge branch 'main' into array_size_bindings
muellch Dec 18, 2023
17a6d43
Cleanup, review comments
muellch Dec 19, 2023
a9937d0
pre-commit
muellch Dec 19, 2023
43d82be
Cleanups
muellch Dec 19, 2023
07f0efc
Formatting
muellch Dec 19, 2023
340b62f
Add back type of z_v_w to stencil 7 test
muellch Dec 19, 2023
73f9fee
Merge branch 'main' into array_size_bindings
muellch Jan 25, 2024
37b758e
Merge branch 'main' into array_size_bindings
muellch Jan 30, 2024
73e22ca
Deactivate unit test for fused_velocity_advection_stencil_1_to_7
muellch Feb 1, 2024
6e5a375
pre commit
muellch Feb 1, 2024
88b404c
Merge branch 'main' into array_size_bindings
muellch Feb 1, 2024
ce4e05f
Merge branch 'main' into array_size_bindings
muellch Feb 5, 2024
3fee875
Merge branch 'main' into array_size_bindings
muellch Feb 6, 2024
41848b2
Print warning if no domain bounds are passed, delete multplefieldoper…
muellch Feb 7, 2024
966079b
pre commit
muellch Feb 7, 2024
941dab4
As Samuel suggested in review, add unit test back in
muellch Feb 8, 2024
4d1c09c
Merge branch 'main' into array_size_bindings
muellch Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...osphere/diffusion/stencils/truly_horizontal_diffusion_nabla_of_theta_over_steep_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def _truly_horizontal_diffusion_nabla_of_theta_over_steep_points(
theta_v_1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[1])))
theta_v_2 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[2])))

theta_v_0_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[0]) + int32(1)))
theta_v_1_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[1]) + int32(1)))
theta_v_2_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[2]) + int32(1)))
theta_v_0_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[0]) + 1))
theta_v_1_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[1]) + 1))
theta_v_2_m1 = theta_v(as_offset(Koff, zd_vertoffset(C2CEC[2]) + 1))

sum_tmp = (
theta_v * geofac_n2s_c
Expand Down
Loading