From 499e9458909cdec7a3460a289edf1d79c323d6c6 Mon Sep 17 00:00:00 2001
From: Eric Dalissier <Eric.Dalissier@imag.fr>
Date: Wed, 20 Feb 2013 15:47:13 +0000
Subject: [PATCH] some modification
---
HySoP/hysop/operator/stretching_d.py | 5 ++---
HySoP/hysop/particular_solvers/basic.py | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/HySoP/hysop/operator/stretching_d.py b/HySoP/hysop/operator/stretching_d.py
index 222f9de05..0b5d957e2 100755
--- a/HySoP/hysop/operator/stretching_d.py
+++ b/HySoP/hysop/operator/stretching_d.py
@@ -62,7 +62,6 @@ class Stretching_d(DiscreteOperator):
-integrate with the chosen method (RK4. RK2. euler)
"""
self.compute_time = time.time()
-
if self.method is not None:
@@ -97,8 +96,8 @@ class Stretching_d(DiscreteOperator):
# Time integration
for i in range (self.ndt) :
methodInt=self.method(self.fonction)
- self.res_vorticity = methodInt.integrate(self.fonction.apply, t, self.dtstretch, self.vorticity.data)
- self.vorticity.data= np.copy(self.res_vorticity)
+ self.vorticity.data = methodInt.integrate(self.fonction.apply, t, self.dtstretch, self.vorticity.data)
+
# Ghosts synchronization
# self.OpSynchronize.apply([self.vorticity.data, self.velocity.data])
diff --git a/HySoP/hysop/particular_solvers/basic.py b/HySoP/hysop/particular_solvers/basic.py
index 1fdbf3e70..8c5544b66 100644
--- a/HySoP/hysop/particular_solvers/basic.py
+++ b/HySoP/hysop/particular_solvers/basic.py
@@ -29,7 +29,7 @@ class ParticleSolver(Solver):
Link with differents numericals methods used.
"""
def __init__(self, problem, t_end, dt,
- ODESolver=None,
+ ODESolver=RK3,
InterpolationMethod=None,
RemeshingMethod=None,
splittingMethod='strang',
--
GitLab