From da12d7c13adf57e753861c6c2b182f5e37b92640 Mon Sep 17 00:00:00 2001
From: Jean-Matthieu Etancelin <jean-matthieu.etancelin@univ-pau.fr>
Date: Thu, 16 Apr 2020 09:54:34 +0200
Subject: [PATCH] Move back example interface outside hysop package
(environment configuration by the interface without importing hysop)
---
{hysop/examples => hysop_examples}/__init__.py | 0
{hysop/examples => hysop_examples}/example_utils.py | 0
{examples => hysop_examples/examples}/.gitignore | 0
{examples => hysop_examples/examples}/analytic/analytic.py | 2 +-
{examples => hysop_examples/examples}/bubble/periodic_bubble.py | 2 +-
.../examples}/bubble/periodic_bubble_levelset.py | 2 +-
.../examples}/bubble/periodic_bubble_levelset_penalization.py | 2 +-
.../examples}/bubble/periodic_jet_levelset.py | 2 +-
.../examples}/cylinder/oscillating_cylinder.py | 2 +-
.../examples}/fixed_point/heat_equation.py | 2 +-
.../examples}/flow_around_sphere/flow_around_sphere.py | 2 +-
.../examples}/multiresolution/scalar_advection.py | 2 +-
.../examples}/particles_above_salt/particles_above_salt_bc.py | 2 +-
.../particles_above_salt/particles_above_salt_bc_3d.py | 2 +-
.../particles_above_salt/particles_above_salt_periodic.py | 2 +-
.../particles_above_salt/particles_above_salt_symmetrized.py | 2 +-
.../examples}/scalar_advection/levelset.py | 2 +-
.../examples}/scalar_advection/scalar_advection.py | 2 +-
.../examples}/scalar_advection/turbulent_scalar_advection.py | 0
.../examples}/scalar_diffusion/scalar_diffusion.py | 2 +-
{examples => hysop_examples/examples}/sediment_deposit/C_IN.DAT | 0
{examples => hysop_examples/examples}/sediment_deposit/init.f90 | 0
.../examples}/sediment_deposit/sediment_deposit.py | 2 +-
.../examples}/sediment_deposit/sediment_deposit_levelset.py | 2 +-
.../examples}/shear_layer/shear_layer.py | 2 +-
{examples => hysop_examples/examples}/taylor_green/bench.sh | 0
.../examples}/taylor_green/data/reference_512_512_512.txt | 0
.../examples}/taylor_green/taylor_green.py | 2 +-
.../examples}/taylor_green/taylor_green_cpuFortran.py | 2 +-
29 files changed, 21 insertions(+), 21 deletions(-)
rename {hysop/examples => hysop_examples}/__init__.py (100%)
rename {hysop/examples => hysop_examples}/example_utils.py (100%)
rename {examples => hysop_examples/examples}/.gitignore (100%)
rename {examples => hysop_examples/examples}/analytic/analytic.py (98%)
rename {examples => hysop_examples/examples}/bubble/periodic_bubble.py (99%)
rename {examples => hysop_examples/examples}/bubble/periodic_bubble_levelset.py (99%)
rename {examples => hysop_examples/examples}/bubble/periodic_bubble_levelset_penalization.py (99%)
rename {examples => hysop_examples/examples}/bubble/periodic_jet_levelset.py (99%)
rename {examples => hysop_examples/examples}/cylinder/oscillating_cylinder.py (99%)
rename {examples => hysop_examples/examples}/fixed_point/heat_equation.py (99%)
rename {examples => hysop_examples/examples}/flow_around_sphere/flow_around_sphere.py (99%)
rename {examples => hysop_examples/examples}/multiresolution/scalar_advection.py (99%)
rename {examples => hysop_examples/examples}/particles_above_salt/particles_above_salt_bc.py (99%)
rename {examples => hysop_examples/examples}/particles_above_salt/particles_above_salt_bc_3d.py (99%)
rename {examples => hysop_examples/examples}/particles_above_salt/particles_above_salt_periodic.py (99%)
rename {examples => hysop_examples/examples}/particles_above_salt/particles_above_salt_symmetrized.py (99%)
rename {examples => hysop_examples/examples}/scalar_advection/levelset.py (99%)
rename {examples => hysop_examples/examples}/scalar_advection/scalar_advection.py (99%)
rename {examples => hysop_examples/examples}/scalar_advection/turbulent_scalar_advection.py (100%)
rename {examples => hysop_examples/examples}/scalar_diffusion/scalar_diffusion.py (98%)
rename {examples => hysop_examples/examples}/sediment_deposit/C_IN.DAT (100%)
rename {examples => hysop_examples/examples}/sediment_deposit/init.f90 (100%)
rename {examples => hysop_examples/examples}/sediment_deposit/sediment_deposit.py (99%)
rename {examples => hysop_examples/examples}/sediment_deposit/sediment_deposit_levelset.py (99%)
rename {examples => hysop_examples/examples}/shear_layer/shear_layer.py (99%)
rename {examples => hysop_examples/examples}/taylor_green/bench.sh (100%)
rename {examples => hysop_examples/examples}/taylor_green/data/reference_512_512_512.txt (100%)
rename {examples => hysop_examples/examples}/taylor_green/taylor_green.py (99%)
rename {examples => hysop_examples/examples}/taylor_green/taylor_green_cpuFortran.py (99%)
diff --git a/hysop/examples/__init__.py b/hysop_examples/__init__.py
similarity index 100%
rename from hysop/examples/__init__.py
rename to hysop_examples/__init__.py
diff --git a/hysop/examples/example_utils.py b/hysop_examples/example_utils.py
similarity index 100%
rename from hysop/examples/example_utils.py
rename to hysop_examples/example_utils.py
diff --git a/examples/.gitignore b/hysop_examples/examples/.gitignore
similarity index 100%
rename from examples/.gitignore
rename to hysop_examples/examples/.gitignore
diff --git a/examples/analytic/analytic.py b/hysop_examples/examples/analytic/analytic.py
similarity index 98%
rename from examples/analytic/analytic.py
rename to hysop_examples/examples/analytic/analytic.py
index 39f15a551..4d7f1d3f8 100755
--- a/examples/analytic/analytic.py
+++ b/hysop_examples/examples/analytic/analytic.py
@@ -119,7 +119,7 @@ def compute(args):
if __name__ == '__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
prog_name = 'analytic'
default_dump_dir = '{}/hysop_examples/{}'.format(HysopArgParser.tmp_dir(), prog_name)
diff --git a/examples/bubble/periodic_bubble.py b/hysop_examples/examples/bubble/periodic_bubble.py
similarity index 99%
rename from examples/bubble/periodic_bubble.py
rename to hysop_examples/examples/bubble/periodic_bubble.py
index 5de7e1e0e..99c7358ba 100644
--- a/examples/bubble/periodic_bubble.py
+++ b/hysop_examples/examples/bubble/periodic_bubble.py
@@ -302,7 +302,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class PeriodicBubbleArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/bubble/periodic_bubble_levelset.py b/hysop_examples/examples/bubble/periodic_bubble_levelset.py
similarity index 99%
rename from examples/bubble/periodic_bubble_levelset.py
rename to hysop_examples/examples/bubble/periodic_bubble_levelset.py
index 237bf8f67..7574769f0 100644
--- a/examples/bubble/periodic_bubble_levelset.py
+++ b/hysop_examples/examples/bubble/periodic_bubble_levelset.py
@@ -300,7 +300,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class PeriodicBubbleArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/bubble/periodic_bubble_levelset_penalization.py b/hysop_examples/examples/bubble/periodic_bubble_levelset_penalization.py
similarity index 99%
rename from examples/bubble/periodic_bubble_levelset_penalization.py
rename to hysop_examples/examples/bubble/periodic_bubble_levelset_penalization.py
index 7cf865cca..1d6a21b8c 100644
--- a/examples/bubble/periodic_bubble_levelset_penalization.py
+++ b/hysop_examples/examples/bubble/periodic_bubble_levelset_penalization.py
@@ -342,7 +342,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class PeriodicBubbleArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/bubble/periodic_jet_levelset.py b/hysop_examples/examples/bubble/periodic_jet_levelset.py
similarity index 99%
rename from examples/bubble/periodic_jet_levelset.py
rename to hysop_examples/examples/bubble/periodic_jet_levelset.py
index 9607f8fde..40d2ecebc 100644
--- a/examples/bubble/periodic_jet_levelset.py
+++ b/hysop_examples/examples/bubble/periodic_jet_levelset.py
@@ -287,7 +287,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class PeriodicJetArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/cylinder/oscillating_cylinder.py b/hysop_examples/examples/cylinder/oscillating_cylinder.py
similarity index 99%
rename from examples/cylinder/oscillating_cylinder.py
rename to hysop_examples/examples/cylinder/oscillating_cylinder.py
index b51b85881..8975a9029 100644
--- a/examples/cylinder/oscillating_cylinder.py
+++ b/hysop_examples/examples/cylinder/oscillating_cylinder.py
@@ -260,7 +260,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class OscillatingCylinderArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/fixed_point/heat_equation.py b/hysop_examples/examples/fixed_point/heat_equation.py
similarity index 99%
rename from examples/fixed_point/heat_equation.py
rename to hysop_examples/examples/fixed_point/heat_equation.py
index d54e802ac..5ed1ad646 100644
--- a/examples/fixed_point/heat_equation.py
+++ b/hysop_examples/examples/fixed_point/heat_equation.py
@@ -197,7 +197,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class IMArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/flow_around_sphere/flow_around_sphere.py b/hysop_examples/examples/flow_around_sphere/flow_around_sphere.py
similarity index 99%
rename from examples/flow_around_sphere/flow_around_sphere.py
rename to hysop_examples/examples/flow_around_sphere/flow_around_sphere.py
index f01e5f9ef..4732e599d 100644
--- a/examples/flow_around_sphere/flow_around_sphere.py
+++ b/hysop_examples/examples/flow_around_sphere/flow_around_sphere.py
@@ -327,7 +327,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
parser = HysopArgParser(prog_name="FlowAroundSphere",
description="""HySoP flow around a sphere.\n""",
default_dump_dir='{}/hysop_examples/FlowAroundSphere'.format(
diff --git a/examples/multiresolution/scalar_advection.py b/hysop_examples/examples/multiresolution/scalar_advection.py
similarity index 99%
rename from examples/multiresolution/scalar_advection.py
rename to hysop_examples/examples/multiresolution/scalar_advection.py
index 98b763292..f7cfbf51d 100644
--- a/examples/multiresolution/scalar_advection.py
+++ b/hysop_examples/examples/multiresolution/scalar_advection.py
@@ -189,7 +189,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class MultiResolutionScalarAdvectionArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/particles_above_salt/particles_above_salt_bc.py b/hysop_examples/examples/particles_above_salt/particles_above_salt_bc.py
similarity index 99%
rename from examples/particles_above_salt/particles_above_salt_bc.py
rename to hysop_examples/examples/particles_above_salt/particles_above_salt_bc.py
index 807120e6b..fecea38c9 100644
--- a/examples/particles_above_salt/particles_above_salt_bc.py
+++ b/hysop_examples/examples/particles_above_salt/particles_above_salt_bc.py
@@ -323,7 +323,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ParticleAboveSaltArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/particles_above_salt/particles_above_salt_bc_3d.py b/hysop_examples/examples/particles_above_salt/particles_above_salt_bc_3d.py
similarity index 99%
rename from examples/particles_above_salt/particles_above_salt_bc_3d.py
rename to hysop_examples/examples/particles_above_salt/particles_above_salt_bc_3d.py
index 3bd83aeb8..a54c41633 100644
--- a/examples/particles_above_salt/particles_above_salt_bc_3d.py
+++ b/hysop_examples/examples/particles_above_salt/particles_above_salt_bc_3d.py
@@ -338,7 +338,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ParticleAboveSaltArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/particles_above_salt/particles_above_salt_periodic.py b/hysop_examples/examples/particles_above_salt/particles_above_salt_periodic.py
similarity index 99%
rename from examples/particles_above_salt/particles_above_salt_periodic.py
rename to hysop_examples/examples/particles_above_salt/particles_above_salt_periodic.py
index 8eaac49a2..fda6b5c66 100644
--- a/examples/particles_above_salt/particles_above_salt_periodic.py
+++ b/hysop_examples/examples/particles_above_salt/particles_above_salt_periodic.py
@@ -333,7 +333,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ParticleAboveSaltArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/particles_above_salt/particles_above_salt_symmetrized.py b/hysop_examples/examples/particles_above_salt/particles_above_salt_symmetrized.py
similarity index 99%
rename from examples/particles_above_salt/particles_above_salt_symmetrized.py
rename to hysop_examples/examples/particles_above_salt/particles_above_salt_symmetrized.py
index f7a393327..42587f275 100644
--- a/examples/particles_above_salt/particles_above_salt_symmetrized.py
+++ b/hysop_examples/examples/particles_above_salt/particles_above_salt_symmetrized.py
@@ -320,7 +320,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ParticleAboveSaltArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/scalar_advection/levelset.py b/hysop_examples/examples/scalar_advection/levelset.py
similarity index 99%
rename from examples/scalar_advection/levelset.py
rename to hysop_examples/examples/scalar_advection/levelset.py
index 8e8dbe82c..76a26d1e5 100644
--- a/examples/scalar_advection/levelset.py
+++ b/hysop_examples/examples/scalar_advection/levelset.py
@@ -215,7 +215,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class LevelsetArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/scalar_advection/scalar_advection.py b/hysop_examples/examples/scalar_advection/scalar_advection.py
similarity index 99%
rename from examples/scalar_advection/scalar_advection.py
rename to hysop_examples/examples/scalar_advection/scalar_advection.py
index 0e061844a..a43204e41 100644
--- a/examples/scalar_advection/scalar_advection.py
+++ b/hysop_examples/examples/scalar_advection/scalar_advection.py
@@ -142,7 +142,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ScalarAdvectionArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/scalar_advection/turbulent_scalar_advection.py b/hysop_examples/examples/scalar_advection/turbulent_scalar_advection.py
similarity index 100%
rename from examples/scalar_advection/turbulent_scalar_advection.py
rename to hysop_examples/examples/scalar_advection/turbulent_scalar_advection.py
diff --git a/examples/scalar_diffusion/scalar_diffusion.py b/hysop_examples/examples/scalar_diffusion/scalar_diffusion.py
similarity index 98%
rename from examples/scalar_diffusion/scalar_diffusion.py
rename to hysop_examples/examples/scalar_diffusion/scalar_diffusion.py
index 085664f09..a5dfcf6bb 100755
--- a/examples/scalar_diffusion/scalar_diffusion.py
+++ b/hysop_examples/examples/scalar_diffusion/scalar_diffusion.py
@@ -118,7 +118,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ScalarDiffusionArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/sediment_deposit/C_IN.DAT b/hysop_examples/examples/sediment_deposit/C_IN.DAT
similarity index 100%
rename from examples/sediment_deposit/C_IN.DAT
rename to hysop_examples/examples/sediment_deposit/C_IN.DAT
diff --git a/examples/sediment_deposit/init.f90 b/hysop_examples/examples/sediment_deposit/init.f90
similarity index 100%
rename from examples/sediment_deposit/init.f90
rename to hysop_examples/examples/sediment_deposit/init.f90
diff --git a/examples/sediment_deposit/sediment_deposit.py b/hysop_examples/examples/sediment_deposit/sediment_deposit.py
similarity index 99%
rename from examples/sediment_deposit/sediment_deposit.py
rename to hysop_examples/examples/sediment_deposit/sediment_deposit.py
index ea0b53c94..1cd16b714 100644
--- a/examples/sediment_deposit/sediment_deposit.py
+++ b/hysop_examples/examples/sediment_deposit/sediment_deposit.py
@@ -334,7 +334,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ParticleAboveSaltArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/sediment_deposit/sediment_deposit_levelset.py b/hysop_examples/examples/sediment_deposit/sediment_deposit_levelset.py
similarity index 99%
rename from examples/sediment_deposit/sediment_deposit_levelset.py
rename to hysop_examples/examples/sediment_deposit/sediment_deposit_levelset.py
index bb566be49..4b8622f08 100644
--- a/examples/sediment_deposit/sediment_deposit_levelset.py
+++ b/hysop_examples/examples/sediment_deposit/sediment_deposit_levelset.py
@@ -395,7 +395,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ParticleAboveSaltArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/shear_layer/shear_layer.py b/hysop_examples/examples/shear_layer/shear_layer.py
similarity index 99%
rename from examples/shear_layer/shear_layer.py
rename to hysop_examples/examples/shear_layer/shear_layer.py
index 29a14fad5..c746c2f6e 100644
--- a/examples/shear_layer/shear_layer.py
+++ b/hysop_examples/examples/shear_layer/shear_layer.py
@@ -205,7 +205,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class ShearLayerArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/taylor_green/bench.sh b/hysop_examples/examples/taylor_green/bench.sh
similarity index 100%
rename from examples/taylor_green/bench.sh
rename to hysop_examples/examples/taylor_green/bench.sh
diff --git a/examples/taylor_green/data/reference_512_512_512.txt b/hysop_examples/examples/taylor_green/data/reference_512_512_512.txt
similarity index 100%
rename from examples/taylor_green/data/reference_512_512_512.txt
rename to hysop_examples/examples/taylor_green/data/reference_512_512_512.txt
diff --git a/examples/taylor_green/taylor_green.py b/hysop_examples/examples/taylor_green/taylor_green.py
similarity index 99%
rename from examples/taylor_green/taylor_green.py
rename to hysop_examples/examples/taylor_green/taylor_green.py
index 1d544f4d7..603a28ba2 100644
--- a/examples/taylor_green/taylor_green.py
+++ b/hysop_examples/examples/taylor_green/taylor_green.py
@@ -315,7 +315,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class TaylorGreenArgParser(HysopArgParser):
def __init__(self):
diff --git a/examples/taylor_green/taylor_green_cpuFortran.py b/hysop_examples/examples/taylor_green/taylor_green_cpuFortran.py
similarity index 99%
rename from examples/taylor_green/taylor_green_cpuFortran.py
rename to hysop_examples/examples/taylor_green/taylor_green_cpuFortran.py
index d89e280f7..22e3f8a05 100644
--- a/examples/taylor_green/taylor_green_cpuFortran.py
+++ b/hysop_examples/examples/taylor_green/taylor_green_cpuFortran.py
@@ -232,7 +232,7 @@ def compute(args):
if __name__=='__main__':
- from hysop.examples.example_utils import HysopArgParser, colors
+ from hysop_examples.example_utils import HysopArgParser, colors
class TaylorGreenArgParser(HysopArgParser):
def __init__(self):
--
GitLab