Commit code to pull into Lorenz for testing

OceanParcels · Apr 29, 2024 · 0a82142 · 0a82142
1 parent aa046d7
commit 0a82142
Show file tree

Hide file tree

Showing 3 changed files with 1,182 additions and 2,746 deletions.
diff --git a/PlasticParcels/constructors.py b/PlasticParcels/constructors.py
@@ -499,7 +499,7 @@ def create_kernel(fieldset, pset):
 def load_default_settings():
     settings = {
                     # Model settings
-                    'mode': '2D', # Options [3D, 2D]
+                    'mode': '3D', # Options [3D, 2D]
                     'allow_time_extrapolation': False,            # Allow extrapolation of time for fieldset
                     'verbose_delete': False,                      # Print extra information when executing delete operations
 

diff --git a/PlasticParcels/kernels.py b/PlasticParcels/kernels.py
@@ -801,8 +801,9 @@ def checkErrorThroughSurface(particle, fieldset, time):
     """ Kernel to set the particle depth to the particle surface if it goes through the surface
     """
     if particle.state == StatusCode.ErrorThroughSurface:
-        particle_ddepth = - particle.depth # Set so that final depth = 0
-        particle.state = StatusCode.Success
+        #particle_ddepth = - particle.depth # Set so that final depth = 0
+        #particle.state = StatusCode.Success
+        particle.delete()
 
 
 def deleteParticle(particle, fieldset, time):

diff --git a/PlasticParcels_cleanup.ipynb b/PlasticParcels_cleanup.ipynb