Commit d4ef3a8d authored by Feliks Kuba Kiszkurno's avatar Feliks Kuba Kiszkurno
Browse files

Changed the example data and fixed small bugs

parent d46167a6
......@@ -2,8 +2,6 @@
<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
<Collection>
<DataSet timestep="69347920" group="" part="0" file="epfe_mesh_ts_80_t_69347920.000000.vtu"/>
<DataSet timestep="78016410" group="" part="0" file="epfe_mesh_ts_90_t_78016410.000000.vtu"/>
<DataSet timestep="86684900" group="" part="0" file="epfe_mesh_ts_100_t_86684900.000000.vtu"/>
<DataSet timestep="95353390" group="" part="0" file="epfe_mesh_ts_110_t_95353390.000000.vtu"/>
</Collection>
</VTKFile>
......@@ -2,8 +2,6 @@
<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
<Collection>
<DataSet timestep="69347920" group="" part="0" file="epfe_mesh_ts_80_t_69347920.000000.vtu"/>
<DataSet timestep="78016410" group="" part="0" file="epfe_mesh_ts_90_t_78016410.000000.vtu"/>
<DataSet timestep="86684900" group="" part="0" file="epfe_mesh_ts_100_t_86684900.000000.vtu"/>
<DataSet timestep="95353390" group="" part="0" file="epfe_mesh_ts_110_t_95353390.000000.vtu"/>
</Collection>
</VTKFile>
......@@ -2,8 +2,6 @@
<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
<Collection>
<DataSet timestep="69347920" group="" part="0" file="epfe_mesh_ts_80_t_69347920.000000.vtu"/>
<DataSet timestep="78016410" group="" part="0" file="epfe_mesh_ts_90_t_78016410.000000.vtu"/>
<DataSet timestep="86684900" group="" part="0" file="epfe_mesh_ts_100_t_86684900.000000.vtu"/>
<DataSet timestep="95353390" group="" part="0" file="epfe_mesh_ts_110_t_95353390.000000.vtu"/>
</Collection>
</VTKFile>
<?xml version="1.0"?>
<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
<Collection>
<DataSet timestep="69347920" group="" part="0" file="epfe_mesh_ts_80_t_69347920.000000.vtu"/>
<DataSet timestep="86684900" group="" part="0" file="epfe_mesh_ts_100_t_86684900.000000.vtu"/>
</Collection>
</VTKFile>
<?xml version="1.0"?>
<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
<Collection>
<DataSet timestep="69347920" group="" part="0" file="epfe_mesh_ts_80_t_69347920.000000.vtu"/>
<DataSet timestep="86684900" group="" part="0" file="epfe_mesh_ts_100_t_86684900.000000.vtu"/>
</Collection>
</VTKFile>
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0"?>
<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
<Collection>
<DataSet timestep="69347920" group="" part="0" file="epfe_mesh_ts_80_t_69347920.000000.vtu"/>
<DataSet timestep="86684900" group="" part="0" file="epfe_mesh_ts_100_t_86684900.000000.vtu"/>
</Collection>
</VTKFile>
......@@ -3,8 +3,10 @@ import os
settings = {'parameter': 'pressure',
'path': os.path.join('/home/kiszkurn/Dev/Data/Experiment1'),
'points_file': os.path.join('/home/kiszkurn/Dev/Data', 'points_isotropic.csv'),
#'path': os.path.join('/home/kiszkurn/Dev/Data/Experiment1'),
#'points_file': os.path.join('/home/kiszkurn/Dev/Data', 'points_isotropic.csv'),
'path': os.path.join(os.path.join('Documentation', 'Example', 'Data')),
'points_file': os.path.join('Documentation', 'Example', 'Data', 'points.csv'),
'plot_ext': ['png'],
'include_legend': True
......@@ -12,10 +14,10 @@ settings = {'parameter': 'pressure',
data_compare = OGSDataCompare(settings)
data_compare.read_data()
data_compare.read_data_full()
data_compare.plot_min_max()
#data_compare.read_data_full()
#data_compare.plot_min_max()
#data_compare.ogs_compare()
#data_compare.ogs_compare_separate()
#data_compare.ogs_compare_time_point(time_step=[1.0, 2.0, 3.0, 4.0, 5.0])
#data_compare.ogs_compare_3d_view(time_step=[1.0, 2.0, 3.0, 4.0, 5.0])
data_compare.ogs_compare_3d_view(time_step=[2.3, 2.7]) # time_step=[1.0, 2.0, 3.0, 4.0, 5.0])
......@@ -53,8 +53,8 @@ def extract_params(folder_name):
param_b = {}
param_a['name'] = folder_name.split("_")[0]
param_a['value'] = folder_name.split("_")[1]
param_a['value'] = float(folder_name.split("_")[1])
param_b['name'] = folder_name.split("_")[-2]
param_b['value'] = folder_name.split("_")[-1]
param_b['value'] = float(folder_name.split("_")[-1])
return param_a, param_b
......@@ -301,7 +301,7 @@ class OGSDataCompare:
# Plot the results
# plt.rcParams['figure.figsize'] = (15, 15)
plt.rcParams.update({'figure.autolayout': True})
#plt.rcParams.update({'figure.autolayout': True})
fig = plt.figure()
ax = fig.add_subplot(111, projection='3d')
ax.scatter(a_param_values, b_param_values, z_values, 'rx', label=experiment_name)
......@@ -312,6 +312,9 @@ class OGSDataCompare:
ax.view_init(azim=20, elev=45)
#fig.set_size_inches(6, 6)
#fig.set_dpi(150)
output_file_name = "{}_3D_values_{}_t_{:.2f}_{}".format(self.config.parameter,
str(sub_param),
self.data.time_steps[time_step_id],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment