Porting the tracer advection to gt4py #252

ninaburg · 2023-07-28T14:50:57Z

Porting and integrating the stencils that are in the operational code path of the tracer advection according to the namelist:

! transport_nml: tracer transport ---------------------------------------------
&transport_nml
 ivadv_tracer                =              3, 3, 3, 3, 3         ! tracer specific method to compute vertical advection
 itype_hlimit                =              3, 4, 4, 4, 4         ! type of limiter for horizontal transport
 itype_vlimit                =              1, 1, 1, 1, 1         ! gdm: 1: semi-monotone slope limiter orig. 2: monotonous type of limiter for vertical transport
 ihadv_tracer                =             52, 2, 2, 2, 2         ! gdm: 52 combination of hybrid FFSL/Miura3 with subcycling
                                                                  ! of tracer specific method to compute horizontal advection
 llsq_svd                    =                      .TRUE.        ! use SV decomposition for least squares design matrix
 nadv_substeps               =                          2         ! number of integration steps per fast physics time step
/

Exceptions: 3 DO WHILE loops in mo_advection_vflux.f90 couldn't be ported.

TODO when ASYNC(1) are added to advection/mo_advection_quadrature.f90:

Liskofy prep_gauss_quadrature_c_(list)_stencil.py

TODO when multiple stencils can be used with different KDim_size in CMakelists.txt:

Add stencils from cycling subroutine stored in a separate branch dsl_advection_cycling

Remark: __init__.py files have been deleted in the tests folders in dycore and advection. Otherwise pytest in model/ wouldn't work. Another alternative would have been to rename the tests folders tests_dycore/ and tests_advection/. This is still to be discussed. EDIT: Changing the names of the folders to <components>_tests as in https://github.com/C2SM/icon4py/pull/260/files#diff-8bce9783214998f11bc562a6e5619e3f25287303b4d210afe4ed6115f80b1c05 has been chosen (see comments)

Co-authored-by: Erwan Cossevin <erwan.cossevin@meteoswiss.ch> Co-authored-by: Stephanie Westerhuis <stephanie.westerhuis@usys.ethz.ch>

* run pre-commit * fix hflx_limiter_pd_stencil_01

* adding hflx_limiter_mo_stencil_02 * changes order of args and return a tuple * Revert "changes order of args and return a tuple" This reverts commit 99638df. * porting step_advection_stencil_01 * porting step_advection_stencil_02 * porting upwind_hflux_miura_stencil_02 * hflx_limiter_mo_stencil_04 * fix step_advection_stencil_01 * hflx_limiter_mo_stencil_03 * clean up: move upwind_hflux_miura_stencil_02.py * add test for conditional branch in hflx_limiter_mo_stencil_04 * switch to using min_over in hflx_limiter_mo_stencil_03 * refactor hflx_limiter_mo_stencil_04, fix tests for Koffset * add upwind_vflux_ppm_stencil_01 * upwind_hflux_miura_stencil_02 - fix sparse field issue, split into separate sums instead of using neighbor_sum * remove commented out code * fix: upwind_vflux_ppm_stencil_01 * fix: hflx_limiter_mo_stencil_01: return tuple, use int32 * hflx_limiter_pd_stencil_02.py: use int fields

Co-authored-by: Magdalena Luz <luzm@ethz.ch> Co-authored-by: Nicoletta Farabullini <41536517+nfarabullini@users.noreply.github.com>

* fixing return type * removing broadcast

(feat) - stencil to set field to zero for Field[[CellDim], float] and Field[[CellDim, KDim], float]

egparedes

It looks good to me. Just make sure the new changes from main fixing pre-commit config are incorporated in the PR before merging.

model/atmosphere/advection/tests/conftest.py

…cils Conflicts: model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/mo_velocity_advection_stencil_18.py model/atmosphere/dycore/src/icon4py/model/atmosphere/dycore/mo_velocity_advection_stencil_20.py model/common/src/icon4py/model/common/test_utils/simple_mesh.py tools/pyproject.toml

ninaburg · 2023-09-21T06:47:18Z

launch jenkins spack

muellch

Looks good!

ninaburg · 2023-09-26T17:06:47Z

launch jenkins spack

merging of greenline with main

* add option to use custom spack-c2sm branch for spack tests * fix missing declarations * fix missing declarations --------- Co-authored-by: Jonas Jucker <jonas.jucker@c2sm.ethz.ch>

This fixes test references where the current implementation assumes a certain behavior of the backend. Specifically, we used np.roll in the references and the backend (by chance) had the same wrap-around behavior. For an upcoming PR in GT4Py, we need to remove that expectation. --------- Co-authored-by: Jonas Jucker <jonas.jucker@c2sm.ethz.ch> Co-authored-by: juckerj <39263956+jonasjucker@users.noreply.github.com> Co-authored-by: Abishek Gopal <abishek.gopal@c2sm.ethz.ch>

Fix static typing annotations in icon4pytools.

This PR allows to use the DELETE statements only for the fused stencil mode. --------- Co-authored-by: Samuel <kellerhalssamuel@gmail.com>

…cils Conflicts: .github/workflows/icon4py-qa.yml model/README.md model/common/src/icon4py/model/common/test_utils/simple_mesh.py model/requirements-dev.txt model/requirements.txt model/tox.ini requirements.txt tools/requirements-dev.txt tox.ini

ninaburg · 2023-09-27T07:16:50Z

launch jenkins spack

abishekg7 · 2023-09-27T14:47:58Z

launch jenkins spack spackProject=C2SM/pyicon4py_with_advection

abishekg7 · 2023-09-28T06:49:32Z

launch jenkins spack spackProject=C2SM/pyicon4py_with_advection

egparedes

ILGTM. Kudos for the great work!

github-actions · 2023-09-28T11:24:34Z

Mandatory Tests

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

launch jenkins spack

Optional Tests

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.

ninaburg · 2023-09-28T11:26:33Z

launch jenkins spack spackProject=C2SM/pyicon4py_with_advection

muellch and others added 30 commits November 29, 2022 14:18

Add first 5 tracer advection stencils to icon4py

2e37841

Co-authored-by: Erwan Cossevin <erwan.cossevin@meteoswiss.ch> Co-authored-by: Stephanie Westerhuis <stephanie.westerhuis@usys.ethz.ch>

Fix hflx limiter pd stencil (#91)

6fda446

* run pre-commit * fix hflx_limiter_pd_stencil_01

Fixes to hflx_limiter_pd_stencil_02 to make it pass probtest

7cd58ed

fix return type of hflx_limiter_mo_stencil_03.py (#104)

2446205

Tracer advection stencils - agopal (#93)

e7de05a

Co-authored-by: Magdalena Luz <luzm@ethz.ch> Co-authored-by: Nicoletta Farabullini <41536517+nfarabullini@users.noreply.github.com>

Fix v_limit_prbl_sm_stencil_01 (#107)

fd9d93f

* fixing return type * removing broadcast

Tracer advection stencils zero copy (#106)

fdf3aed

(feat) - stencil to set field to zero for Field[[CellDim], float] and Field[[CellDim, KDim], float]

fix pre-commit hook

60391f1

Add third coefficient to upwind hflux miura stencil 02

f9df7b4

Merge branch 'main' into tracer_advection_stencils

73addd3

hflux_ffsl_hybrid (scheme 5) stencils

b90bb4e

recon_lsq_cell_c_stencil.py addition but svd=False doesn't work in ICON

98c60e6

CECEC + C2E2C2E2C definitions added

f861a3f

Merge branch 'main' into tracer_advection_stencils

006cadd

Merge branch 'main' into tracer_advection_stencils

fcae838

first try

9af4c87

add _face_val_ppm_stencil_01

6f5b7b4

add more stencils

ccce859

rename file

090147b

merge stencils

1c781e4

add stencil 2

54e5d2f

remove stencil 3

b2e8536

fix bounds

2f018e2

fix test

11e63e3

fix test

4ec708b

fix test

4773201

add test

bf80cf4

cleanup

a127cb3

fix

9e32f4f

muellch requested a review from huppd August 29, 2023 09:26

egparedes reviewed Sep 4, 2023

View reviewed changes

model/atmosphere/advection/tests/conftest.py Outdated Show resolved Hide resolved

Nina Burgdorfer added 3 commits September 8, 2023 08:19

Adapt pre-commit and QA fixes for advection component

f42ae38

Pre-commit run with new configs

a76337f

muellch self-requested a review September 26, 2023 08:59

muellch approved these changes Sep 26, 2023

View reviewed changes

Nina Burgdorfer and others added 11 commits September 27, 2023 08:45

Change names for test folders to '<component>_tests' and add __init__.py

3851687

Merge greenline to main (#260)

a95c820

merging of greenline with main

[CI] add option to use custom spack-c2sm branch for spack tests (#268)

0872455

* add option to use custom spack-c2sm branch for spack tests * fix missing declarations * fix missing declarations --------- Co-authored-by: Jonas Jucker <jonas.jucker@c2sm.ethz.ch>

Adapt conftest.py and remove stencil not in code path

7876eb5

Fix typing in icon4pytools (#267)

6358ce9

Fix static typing annotations in icon4pytools.

Ignore delete statements in fused mode (#266)

9e2fbb4

This PR allows to use the DELETE statements only for the fused stencil mode. --------- Co-authored-by: Samuel <kellerhalssamuel@gmail.com>

Add custom marker slow_tests to skip 4 slow stencils for testing

ad6b8b7

Run pre-commit

a50b1af

Add custom marker slow_tests to skip 4 slow stencils for testing

24a6788

Run pre-commit

d4436c0

ninaburg force-pushed the tracer_advection_stencils branch from 57852e5 to d4436c0 Compare September 27, 2023 07:06

egparedes approved these changes Sep 28, 2023

View reviewed changes

pre-commit fix

aad80b8

egparedes merged commit 0e33325 into main Sep 28, 2023
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Porting the tracer advection to gt4py #252

Porting the tracer advection to gt4py #252

ninaburg commented Jul 28, 2023 •

edited

Loading

egparedes left a comment

ninaburg commented Sep 21, 2023

muellch left a comment

ninaburg commented Sep 26, 2023

ninaburg commented Sep 27, 2023

abishekg7 commented Sep 27, 2023

abishekg7 commented Sep 28, 2023

egparedes left a comment

github-actions bot commented Sep 28, 2023

ninaburg commented Sep 28, 2023

Porting the tracer advection to gt4py #252

Porting the tracer advection to gt4py #252

Conversation

ninaburg commented Jul 28, 2023 • edited Loading

egparedes left a comment

Choose a reason for hiding this comment

ninaburg commented Sep 21, 2023

muellch left a comment

Choose a reason for hiding this comment

ninaburg commented Sep 26, 2023

ninaburg commented Sep 27, 2023

abishekg7 commented Sep 27, 2023

abishekg7 commented Sep 28, 2023

egparedes left a comment

Choose a reason for hiding this comment

github-actions bot commented Sep 28, 2023

ninaburg commented Sep 28, 2023

ninaburg commented Jul 28, 2023 •

edited

Loading