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

Analytical Advection in jit #1612

Draft
wants to merge 59 commits into
base: master
Choose a base branch
from
Draft

Analytical Advection in jit #1612

wants to merge 59 commits into from

Conversation

erikvansebille
Copy link
Member

@erikvansebille erikvansebille commented Jul 26, 2024 •
edited
Loading

This PR implements a C version of the AnalyticalAdvection kernel for use with JITParticles, and thereby implements #1617

  • make unit tests work
  • confirm AnalyticalAdvection also works on spherical grids
  • Support for models that don't have grid sizes provided (e.g. missing e1v, e2u etc for ORCA grids)
  • Implement B-grid support too
  • performance-test and validate AnalyticalAdvection in real-world scenarios
  • (potentially) make AnalyticalAdvection the default kernel in Parcels; or at least encourage its use in a new 'Choosing-Advection-Kernels-tutorial' (see also Add a tutorial to help users choose an appropriate advection kernel #1549)

@erikvansebille
First attempt to create header-file for analytical advection in JIT
91fb4e0
@erikvansebille
First semi-complete C-version of analytical-advection (not working)
90e1190
@erikvansebille
Fixing customed_Cfunc_header_test to use particle_dlon
81d7c1d
@erikvansebille
Fixing small but important bug in advection computation
314493a
@erikvansebille
Using functions for computing ds and rs
760fe58
@erikvansebille
Adding support for dt<0
f48d052
@erikvansebille
Adding 3D support to analyticaladvection
6e96fe3
@erikvansebille
renaming xgrid_loc, ygrid_loc to px, py
ebd11cb
@erikvansebille
Automatic loading of library when calling AdvectionAnalytical in JIT
2a67fd1
@erikvansebille
Updating function names for future support of 2D
beb1a0a
@erikvansebille
Implementing separate 2D kernel for JIT AnalyticalAdvection
eed3422
@erikvansebille
Support for 2D JIT AnalyticalAdvection in kernel.py
1fb9de2
@erikvansebille
Merge branch 'master' into analyticaladvection_in_jit
bfab79c
@erikvansebille
FIxing timevarying flow in 2D mode
cd325b8
@erikvansebille
Setting include_dirs to inlcude application_kernels
5c03327
@erikvansebille
Fixing 2D analyticaladvection to work with and without time
1f56ec9
@erikvansebille
Adding particle.ti as function input
acba3fd
@erikvansebille
Fixing xi sampling code, and making unit test more subtle
47f50a0
@erikvansebille
Fixing calling analyticaladvection with general particle.xi
d2c27f3
@erikvansebille
Fixing small bug in jit analyticaladvection
c769886
@erikvansebille
Fixing AnalyticalAdvection Kernels to also work well for negative speeds
2bc9af3
@erikvansebille
Combining AnalyticalAdvection in 2D and 3D JIT into one C function
74b0d83
@erikvansebille
Using particle_ddepth in analyticaladvection
0edacc5
@erikvansebille
FIxing Scipy AnalyticalAdvection to add to dlon,dlat,ddepth instead o…
ff57384 
…f overwrite
@erikvansebille
Updating AnalyticalAdvection tutorial
d4c9a6a
@erikvansebille erikvansebille mentioned this pull request Jul 26, 2024
Merged
@erikvansebille erikvansebille self-assigned this Jul 26, 2024
@erikvansebille erikvansebille linked an issue Jul 26, 2024 that may be closed by this pull request
Implement AnalyticalAdvection Kernel in JIT #1617
Open
erikvansebille and others added 17 commits July 29, 2024 10:27
@erikvansebille
Changing gcode -> gtype in advectionanalytical.h
46b9675
@erikvansebille
setting counter inside for-loop for reduced clutter
abbf683
@erikvansebille
Fixing bug in backward AnalyticalAdvection where wrong cell was used
6203413
@erikvansebille
Fixing grid search bug, and increasing tolerance for grid search
e24041f
@erikvansebille
Finding correct cell for analyticaladvection in a loop
c28a4df
@erikvansebille
Adding support for time-evolving fields in cell search
8f34f69
@erikvansebille
Merge branch 'master' into analyticaladvection_in_jit
2f4cae3
@erikvansebille
Update tutorial_advection to new parcels import
317172c
@VeckoTheGecko
Merge branch 'master' into analyticaladvection_in_jit
6bbbe70
@VeckoTheGecko
Add noqa flags
0a98f39
@erikvansebille
Using NEMO cell edges (e1v, e2u etc) in calculation of fluxes
99d94b2 
This hugely improves the accuracy in e.g. a fwd-bwd run of the NEMO Gulf Stream simulation

This needs to be coded much cleaner still
@erikvansebille
Merge branch 'master' into analyticaladvection_in_jit
405cc6d
@erikvansebille
Merge branch 'analyticaladvection_in_jit' of https://github.com/Ocean…
c5fe559 
…Parcels/parcels into analyticaladvection_in_jit
@erikvansebille
Fixing analyticaladvection to expect grid sizes in Nemo format
c025d94
@erikvansebille
Updating test_advection to use nemo gridsizes for AA
2ea2c73
@erikvansebille
Merge branch 'master' into analyticaladvection_in_jit
af46e0e
@erikvansebille
Adding comment to also update Scipy AA code
a1750d5
@codecov Codecov
Copy link

codecov bot commented Aug 26, 2024 •
edited
Loading

Welcome to Codecov 🎉

Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests.

Thanks for integrating Codecov - We've got you covered ☂️

@erikvansebille erikvansebille mentioned this pull request Aug 29, 2024
Draft
@michaeldenes
Copy link
Member

@erikvansebille is 47f50a0 the commit that will fix #1689 ?

@michaeldenes
Copy link
Member

@erikvansebille is 47f50a0 the commit that will fix #1689 ?

Looks like you already placed the fix in master! #1614

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@erikvansebille erikvansebille

Labels
None yet
Projects
Parcels development
Status: Backlog
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement AnalyticalAdvection Kernel in JIT
3 participants
@erikvansebille @michaeldenes @VeckoTheGecko