From 1367682e29e69128716c1e0fda283d2865f4b0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20L=2E=20Magalh=C3=A3es?= <pmlpm@posteo.de>
Date: Mon, 15 Jul 2024 20:02:46 +0200
Subject: [PATCH] Revised location of data files.
---
tests/test_all.py | 18 +++++-----
tests/test_flow.py | 48 ++++++++++++-------------
tests/test_flow_pipes.py | 18 +++++-----
tests/test_fluid.py | 10 +++---
tests/test_pipes.py | 20 +++++------
tests/test_system.py | 46 ++++++++++++------------
tests/test_trenches.py | 76 ++++++++++++++++++++--------------------
tests/test_utils.py | 6 ++--
8 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/tests/test_all.py b/tests/test_all.py
index ffb4263..16e0f80 100644
--- a/tests/test_all.py
+++ b/tests/test_all.py
@@ -20,31 +20,31 @@ def test_suite():
# load fluid data
# load pipe data
- singlepipedata_files = ['tests/data/isoplus_single_disconti_s1.csv',
- 'tests/data/isoplus_single_disconti_s1.csv',
- 'tests/data/isoplus_single_disconti_s1.csv']
+ singlepipedata_files = ['examples/pipes/isoplus_single_disconti_s1.csv',
+ 'examples/pipes/isoplus_single_disconti_s1.csv',
+ 'examples/pipes/isoplus_single_disconti_s1.csv']
singlepipedb = StandardisedPipeDatabase(source=singlepipedata_files)
# twin pipe data files
- twinpipedata_files = ['tests/data/isoplus_twin_disconti_s1.csv',
- 'tests/data/isoplus_twin_disconti_s2.csv',
- 'tests/data/isoplus_twin_disconti_s3.csv']
+ twinpipedata_files = ['examples/pipes/isoplus_twin_disconti_s1.csv',
+ 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ 'examples/pipes/isoplus_twin_disconti_s3.csv']
twinpipedb = StandardisedPipeDatabase(source=twinpipedata_files)
# get oil properties' database
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
oil_db = FluidDatabase(fluid='oil',
phase='l',
source=oildata_file)
# get water properties' database
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
water_db = FluidDatabase(fluid='fluid',
phase='l',
source=waterdata_file)
# get air properties' database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
air_db = FluidDatabase(fluid='air',
phase='g',
source=airdata_file)
diff --git a/tests/test_flow.py b/tests/test_flow.py
index 2932fc6..cf2a9c3 100644
--- a/tests/test_flow.py
+++ b/tests/test_flow.py
@@ -18,7 +18,7 @@ class TestFluidFlow:
# Cengel (2003): example 7.1, page 376
# get oil properties' database
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
fluid_db = FluidDatabase(
fluid='oil',
phase='l',
@@ -53,7 +53,7 @@ class TestFluidFlow:
# Cengel (2003): example 7.2, page 377
# get air properties' database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -114,7 +114,7 @@ class TestFluidFlow:
# Cengel (2003), Example 8-2, page 439
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -161,7 +161,7 @@ class TestFluidFlow:
def test_different_input_sizes(self):
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -187,7 +187,7 @@ class TestFluidFlow:
def test_incompatible_inputs(self):
# fluid database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -214,7 +214,7 @@ class TestFluidFlow:
def test_inconsistent_types(self):
# fluid database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -281,7 +281,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-1, page 430-431
# get water properties' database
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -413,7 +413,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-1, page 430-431
# get water properties' database
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -532,7 +532,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-1, page 430-431
# get water properties' database
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -683,7 +683,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-2, page 438
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -787,7 +787,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-3, page 439
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -939,7 +939,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-4, page 445
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1045,7 +1045,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-5, page 446
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1193,7 +1193,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-5, page 446
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1337,7 +1337,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-5, page 446
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1490,7 +1490,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-5, page 446
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1639,7 +1639,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-6, page 448
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -1768,7 +1768,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-6, page 448
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -1906,7 +1906,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-6, page 448
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -2079,7 +2079,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-6, page 448
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -2237,7 +2237,7 @@ class TestInternalFluidFlow:
def test_multiple_iterations(self):
# air
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -2384,7 +2384,7 @@ class TestInternalFluidFlow:
def test_wrong_inputs(self):
# fluid database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
fluid_db = FluidDatabase(
fluid='air',
phase=FluidDatabase.fluid_GAS,
@@ -2756,7 +2756,7 @@ class TestInternalFluidFlow:
def test_no_nusselt_nor_friction_factor(self):
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
phase = FluidDatabase.fluid_GAS
fluid_db = FluidDatabase(
fluid='air',
@@ -2794,7 +2794,7 @@ class TestInternalFluidFlow:
# Cengel (2003), Example 8-2, page 438
# Cengel (2003), Example 8-4, page 445
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
diff --git a/tests/test_flow_pipes.py b/tests/test_flow_pipes.py
index 7eeec62..b42739d 100644
--- a/tests/test_flow_pipes.py
+++ b/tests/test_flow_pipes.py
@@ -17,7 +17,7 @@ class TestInternalFluidFlowCircularPipe:
# test using predefined friction factor and nusselt number
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -116,7 +116,7 @@ class TestInternalFluidFlowCircularPipe:
# Cengel (2003), Example 8-2, page 439
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -215,7 +215,7 @@ class TestInternalFluidFlowCircularPipe:
# Cengel (2003), Example 8-3, page 439
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -354,7 +354,7 @@ class TestInternalFluidFlowCircularPipe:
# Cengel (2003), Example 8-3, page 439
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -503,7 +503,7 @@ class TestInternalFluidFlowCircularPipe:
# Cengel (2003), Example 8-3, page 439
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -655,7 +655,7 @@ class TestInternalFluidFlowCircularPipe:
# Cengel (2003), Example 8-4, page 445
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -753,7 +753,7 @@ class TestInternalFluidFlowCircularPipe:
# Cengel (2003), Example 8-5, page 446
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -892,7 +892,7 @@ class TestInternalFluidFlowCircularPipe:
# Incropera2006: Example 8.4, page 507
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -977,7 +977,7 @@ class TestInternalFluidFlowCircularPipe:
# Duffie and Beckman (2013), example 3.14.1, page 161
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
diff --git a/tests/test_fluid.py b/tests/test_fluid.py
index 75541db..dc0c7f0 100644
--- a/tests/test_fluid.py
+++ b/tests/test_fluid.py
@@ -17,7 +17,7 @@ class TestFluid:
# Cengel (2003), example 7-1, page 376-377
# get oil properties' database
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
fluid_db = FluidDatabase(
fluid='oil',
phase='l',
@@ -81,7 +81,7 @@ class TestFluid:
# Cengel (2003), example 7-2, page 377-378
# get air properties' database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
fluid_db = FluidDatabase(
fluid='air',
phase='g',
@@ -139,7 +139,7 @@ class TestFluid:
def test_incompatible_phase(self):
# get air properties' database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
fluid_db = FluidDatabase(
fluid='air',
phase='g',
@@ -164,7 +164,7 @@ class TestFluid:
# test ideal gases under different pressures
# get air properties' database
- airdata_file = 'tests/data/incropera2006_air_1atm.csv'
+ airdata_file = 'examples/fluids/incropera2006_air_1atm.csv'
fluid_db = FluidDatabase(
fluid='air',
phase='g',
@@ -275,7 +275,7 @@ class TestFluid:
# Cengel (2003), Example 8-3, page 439
# get oil properties' database
- oildata_file = 'tests/data/incropera2006_engine_oil.csv'
+ oildata_file = 'examples/fluids/incropera2006_engine_oil.csv'
fluid_db = FluidDatabase(
fluid='oil',
phase='l',
diff --git a/tests/test_pipes.py b/tests/test_pipes.py
index c47ea5e..e613226 100644
--- a/tests/test_pipes.py
+++ b/tests/test_pipes.py
@@ -186,9 +186,9 @@ class TestPipe:
# twin pipe data files
- twinpipedata_files = ['tests/data/isoplus_twin_disconti_s1.csv',
- 'tests/data/isoplus_twin_disconti_s2.csv',
- 'tests/data/isoplus_twin_disconti_s3.csv']
+ twinpipedata_files = ['examples/pipes/isoplus_twin_disconti_s1.csv',
+ 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ 'examples/pipes/isoplus_twin_disconti_s3.csv']
pipedb = StandardisedPipeDatabase(source=twinpipedata_files)
@@ -245,9 +245,9 @@ class TestPipe:
def test_create_standardised_pipe_via_db(self):
- singlepipedata_files = ['tests/data/isoplus_single_disconti_s1.csv',
- 'tests/data/isoplus_single_disconti_s1.csv',
- 'tests/data/isoplus_single_disconti_s3.csv']
+ singlepipedata_files = ['examples/pipes/isoplus_single_disconti_s1.csv',
+ 'examples/pipes/isoplus_single_disconti_s1.csv',
+ 'examples/pipes/isoplus_single_disconti_s3.csv']
pipedb = StandardisedPipeDatabase(source=singlepipedata_files)
@@ -323,7 +323,7 @@ class TestPipe:
def test_create_single_standardised_db(self):
pipe_files = [
- 'tests/data/enerpipe_caldopex_single.csv',
+ 'examples/pipes/enerpipe_caldopex_single.csv',
]
pipedb = StandardisedPipeDatabase(source=pipe_files)
@@ -364,7 +364,7 @@ class TestPipe:
def test_create_twin_standardised_db(self):
pipe_files = [
- 'tests/data/enerpipe_caldopex_twin.csv'
+ 'examples/pipes/enerpipe_caldopex_twin.csv'
]
pipedb = StandardisedPipeDatabase(source=pipe_files)
@@ -398,8 +398,8 @@ class TestPipe:
def test_create_mixed_standardised_db(self):
pipe_files = [
- 'tests/data/enerpipe_caldopex_single.csv',
- 'tests/data/enerpipe_caldopex_twin.csv'
+ 'examples/pipes/enerpipe_caldopex_single.csv',
+ 'examples/pipes/enerpipe_caldopex_twin.csv'
]
pipedb = StandardisedPipeDatabase(source=pipe_files)
diff --git a/tests/test_system.py b/tests/test_system.py
index 9d5c5ef..e0334d1 100644
--- a/tests/test_system.py
+++ b/tests/test_system.py
@@ -34,16 +34,16 @@ class TestPipeSystem:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_twin_disconti_s1.csv',
- # 'tests/data/isoplus_twin_disconti_s2.csv',
- # 'tests/data/isoplus_twin_disconti_s3.csv',
+ 'examples/pipes/isoplus_twin_disconti_s1.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# pipe tuples
@@ -159,16 +159,16 @@ class TestPipeSystem:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_twin_disconti_s1.csv',
- # 'tests/data/isoplus_twin_disconti_s2.csv',
- # 'tests/data/isoplus_twin_disconti_s3.csv',
+ 'examples/pipes/isoplus_twin_disconti_s1.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# pipe tuples
@@ -256,16 +256,16 @@ class TestPipeSystem:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_single_disconti_s1.csv',
- # 'tests/data/isoplus_single_disconti_s2.csv',
- # 'tests/data/isoplus_single_disconti_s3.csv',
+ 'examples/pipes/isoplus_single_disconti_s1.csv',
+ # 'examples/pipes/isoplus_single_disconti_s2.csv',
+ # 'examples/pipes/isoplus_single_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# pipe tuples
@@ -384,16 +384,16 @@ class TestPipeSystem:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_single_disconti_s1.csv',
- # 'tests/data/isoplus_single_disconti_s2.csv',
- # 'tests/data/isoplus_single_disconti_s3.csv',
+ 'examples/pipes/isoplus_single_disconti_s1.csv',
+ # 'examples/pipes/isoplus_single_disconti_s2.csv',
+ # 'examples/pipes/isoplus_single_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# pipe tuples
@@ -535,7 +535,7 @@ class TestPipeSystem:
def test_heat_transfer_rate(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='water',
@@ -856,7 +856,7 @@ class TestPipeSystem:
def test_incorrect_inputs(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1057,7 +1057,7 @@ class TestPipeSystem:
# create supply return pipe system with two pipe objects and different
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1302,7 +1302,7 @@ class TestPipeSystem:
def test_roder2021_rated_capacity(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1488,7 +1488,7 @@ class TestPipeSystem:
def test_roder2021_rated_capacity_rough_pipes(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1593,7 +1593,7 @@ class TestPipeSystem:
def test_roder2021_rated_capacity_twin(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1739,7 +1739,7 @@ class TestPipeSystem:
def test_roder2021_rated_capacity_vector_mode(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
diff --git a/tests/test_trenches.py b/tests/test_trenches.py
index 308cf95..827cdab 100644
--- a/tests/test_trenches.py
+++ b/tests/test_trenches.py
@@ -26,7 +26,7 @@ class TestPipeTrench:
# get water properties' database
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
water_db = FluidDatabase(fluid='fluid',
phase='l',
@@ -125,7 +125,7 @@ class TestPipeTrench:
# get water properties' database
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
water_db = FluidDatabase(fluid='fluid',
phase='l',
@@ -227,7 +227,7 @@ class TestPipeTrench:
# water properties
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
water_db = FluidDatabase(fluid='fluid',
phase='l',
@@ -323,7 +323,7 @@ class TestPipeTrench:
# water properties
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
water_db = FluidDatabase(fluid='fluid',
phase='l',
@@ -715,7 +715,7 @@ class TestPipeTrench:
# Bohm et al. (2005)
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -784,7 +784,7 @@ class TestPipeTrench:
# Sven and ... (2013), page 80
# pipe: DN150, insulation class III (as defined in page 320)
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -853,7 +853,7 @@ class TestPipeTrench:
# Sven and ... (2013), page 80
# pipe: DN150, insulation class III (as defined in page 320)
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -959,7 +959,7 @@ class TestPipeTrench:
# Sven and ... (2013), page 80
# pipe: DN150, insulation class III (as defined in page 320)
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -1620,7 +1620,7 @@ class TestPipeTrench:
# Sven and ... (2013), page 80
# pipe: DN150, insulation class III (as defined in page 320)
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -2050,7 +2050,7 @@ class TestPipeTrench:
def test_bohm2005_distribution_pipes_twin(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -2185,7 +2185,7 @@ class TestPipeTrench:
def test_bohm2005_distribution_pipes_twin_vector(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -2397,7 +2397,7 @@ class TestPipeTrench:
def test_bohm2005_distribution_pipes_single(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -2515,13 +2515,13 @@ class TestPipeTrench:
# load pipe data
pipedata_files = [
- 'tests/data/enerpipe_caldopex_single.csv',
- 'tests/data/enerpipe_caldopex_twin.csv'
+ 'examples/pipes/enerpipe_caldopex_single.csv',
+ 'examples/pipes/enerpipe_caldopex_twin.csv'
]
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# water
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -2733,16 +2733,16 @@ class TestPipeTrench:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_twin_disconti_s1.csv',
- # 'tests/data/isoplus_twin_disconti_s2.csv',
- # 'tests/data/isoplus_twin_disconti_s3.csv',
+ 'examples/pipes/isoplus_twin_disconti_s1.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = fic.FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# *****************************************************************************
@@ -2835,16 +2835,16 @@ class TestPipeTrench:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_twin_disconti_s1.csv',
- # 'tests/data/isoplus_twin_disconti_s2.csv',
- # 'tests/data/isoplus_twin_disconti_s3.csv',
+ 'examples/pipes/isoplus_twin_disconti_s1.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = fic.FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# *****************************************************************************
@@ -2924,16 +2924,16 @@ class TestPipeTrench:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_twin_disconti_s1.csv',
- # 'tests/data/isoplus_twin_disconti_s2.csv',
- # 'tests/data/isoplus_twin_disconti_s3.csv',
+ 'examples/pipes/isoplus_twin_disconti_s1.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = fic.FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# *****************************************************************************
@@ -3028,16 +3028,16 @@ class TestPipeTrench:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_twin_disconti_s1.csv',
- # 'tests/data/isoplus_twin_disconti_s2.csv',
- # 'tests/data/isoplus_twin_disconti_s3.csv',
+ 'examples/pipes/isoplus_twin_disconti_s1.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s2.csv',
+ # 'examples/pipes/isoplus_twin_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = fic.FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# pipe tuples
@@ -3139,16 +3139,16 @@ class TestPipeTrench:
# pipe data
pipedata_files = [
- 'tests/data/isoplus_single_disconti_s1.csv',
- # 'tests/data/isoplus_single_disconti_s2.csv',
- # 'tests/data/isoplus_single_disconti_s3.csv',
+ 'examples/pipes/isoplus_single_disconti_s1.csv',
+ # 'examples/pipes/isoplus_single_disconti_s2.csv',
+ # 'examples/pipes/isoplus_single_disconti_s3.csv',
]
# pipe data
pipedb = StandardisedPipeDatabase(source=pipedata_files)
# fluid data
- fluiddata_file = 'tests/data/incropera2006_saturated_water.csv'
+ fluiddata_file = 'examples/fluids/incropera2006_saturated_water.csv'
fluiddb = fic.FluidDatabase(fluid='water', phase='l', source=fluiddata_file)
# pipe tuples
@@ -3227,7 +3227,7 @@ class TestPipeTrench:
def test_different_single_pipes(self):
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
@@ -3371,11 +3371,11 @@ class TestPipeTrench:
def test_district_cooling(self):
# load pipe data
- singlepipedata_files = ['tests/data/enerpipe_caldopex_single.csv']
+ singlepipedata_files = ['examples/pipes/enerpipe_caldopex_single.csv']
singlepipedb = StandardisedPipeDatabase(source=singlepipedata_files)
# water
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
phase = FluidDatabase.fluid_LIQUID
fluid_db = FluidDatabase(
fluid='fluid',
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 3704a92..96acf0d 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -19,7 +19,7 @@ class TestUtils:
def test_specific_pressure_loss_matching_routine(self):
# get water properties' database
- waterdata_file = 'tests/data/incropera2006_saturated_water.csv'
+ waterdata_file = 'examples/fluids/incropera2006_saturated_water.csv'
water_db = FluidDatabase(
fluid='fluid',
phase='l',
@@ -153,11 +153,11 @@ class TestUtils:
def test_validate_minimum_trench_dimensions(self):
# load pipe data
- singlepipedata_files = ['tests/data/isoplus_single_disconti_s1.csv']
+ singlepipedata_files = ['examples/pipes/isoplus_single_disconti_s1.csv']
singlepipedb = StandardisedPipeDatabase(source=singlepipedata_files)
# twin pipe data files
- twinpipedata_files = ['tests/data/isoplus_twin_disconti_s1.csv']
+ twinpipedata_files = ['examples/pipes/isoplus_twin_disconti_s1.csv']
twinpipedb = StandardisedPipeDatabase(source=twinpipedata_files)
# water pipes
--
GitLab