Skip to content
Snippets Groups Projects
Commit b6fee1e6 authored by Jan Habscheid's avatar Jan Habscheid
Browse files

H-refinements 0 and 1

parent 366f2863
Branches
No related tags found
1 merge request!5h-refinement for order 0 and 1
Showing
with 146 additions and 149 deletions
......@@ -11,31 +11,39 @@ from models.GaussianProcessRegressor import GaussianProcessRegressionModel
parser = argparse.ArgumentParser(
description="Script that reads the Elevation Degrees from CMD"
)
parser.add_argument("--e", required=False, type=int)
parser.add_argument("--r", required=True, type=int)
parser.add_argument("--n", required=False, type=int)
parser.add_argument("--R_lower", required=False, type=int)
parser.add_argument("--R_upper", required=False, type=int)
parser.add_argument("--R_step", required=False, type=int)
args = parser.parse_args()
if args.e is not None:
DEGREE_ELEVATIONS = args.r
else:
DEGREE_ELEVATIONS = 1
if args.r is not None:
H_REFINEMENTS = args.r
else:
H_REFINEMENTS = 0
print('DEGREE_ELEVATIONS:', DEGREE_ELEVATIONS)
print('H_REFINEMENTS:', H_REFINEMENTS)
if args.n is not None:
N_RUNS = args.n
else:
N_RUNS = 1
print('DEGREE_ELEVATIONS:', DEGREE_ELEVATIONS)
DataFolder = f'Data/DegreeElevations_{DEGREE_ELEVATIONS}'
# Create the folder to store the trained models
DataFolder = f'Data/DegreeElevations_{DEGREE_ELEVATIONS}'
DataFolder = f'Data/H_REFINEMENTS_{H_REFINEMENTS}'
if not os.path.exists(f'{DataFolder}/TrainedModels'):
os.mkdir(f'{DataFolder}/TrainedModels')
models = {
# 'GP_DotWhite': GaussianProcessRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'GP_RBF': GaussianProcessRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'GP_Matern': GaussianProcessRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
'GP_RationalQuadratic': GaussianProcessRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS), # Sehr langsam, besser raus nehmen
# 'GP_ExpSineSquared': GaussianProcessRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'GP_DotWhite': GaussianProcessRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
# 'GP_RBF': GaussianProcessRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
# 'GP_Matern': GaussianProcessRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
'GP_RationalQuadratic': GaussianProcessRegressionModel(H_REFINEMENTS=H_REFINEMENTS), # !Sehr langsam, aber sehr gut
# 'GP_ExpSineSquared': GaussianProcessRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
}
Kernel = [
......
......@@ -9,34 +9,42 @@ from models.RBFInterpolator import RadialBasisRegressionModel
parser = argparse.ArgumentParser(
description="Script that reads the Elevation Degrees from CMD"
)
parser.add_argument("--e", required=False, type=int)
parser.add_argument("--r", required=True, type=int)
parser.add_argument("--n", required=False, type=int)
parser.add_argument("--R_lower", required=False, type=int)
parser.add_argument("--R_upper", required=False, type=int)
parser.add_argument("--R_step", required=False, type=int)
args = parser.parse_args()
if args.e is not None:
DEGREE_ELEVATIONS = args.r
else:
DEGREE_ELEVATIONS = 1
if args.r is not None:
H_REFINEMENTS = args.r
else:
H_REFINEMENTS = 0
print('DEGREE_ELEVATIONS:', DEGREE_ELEVATIONS)
print('H_REFINEMENTS:', H_REFINEMENTS)
if args.n is not None:
N_RUNS = args.n
else:
N_RUNS = 1
print('DEGREE_ELEVATIONS:', DEGREE_ELEVATIONS)
DataFolder = f'Data/DegreeElevations_{DEGREE_ELEVATIONS}'
# Create the folder to store the trained models
DataFolder = f'Data/DegreeElevations_{DEGREE_ELEVATIONS}'
DataFolder = f'Data/H_REFINEMENTS_{H_REFINEMENTS}'
if not os.path.exists(f'{DataFolder}/TrainedModels'):
os.mkdir(f'{DataFolder}/TrainedModels')
models = {
'RBF_Linear': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
'RBF_thinplatespline': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
'RBF_cubic': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'RBF_quintic': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'RBF_multiquadric': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'RBF_inversemultiquadric': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'RBF_inversequadratic': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
# 'RBF_gaussian': RadialBasisRegressionModel(DEGREE_ELEVATIONS=DEGREE_ELEVATIONS),
'RBF_Linear': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
'RBF_thinplatespline': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
'RBF_cubic': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
# 'RBF_quintic': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
# 'RBF_multiquadric': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
# 'RBF_inversemultiquadric': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
# 'RBF_inversequadratic': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
# 'RBF_gaussian': RadialBasisRegressionModel(H_REFINEMENTS=H_REFINEMENTS),
}
Kernel = [
......
......@@ -58,15 +58,15 @@ if args.Architecture is not None:
else:
raise ValueError('Architecture not recognized')
models = {
'LinearRegression': LinearRegressionModel(),
# 'LinearRegression': LinearRegressionModel(),
# 'GP_DotWhite': GaussianProcessRegressionModel(),
# 'GP_RBF': GaussianProcessRegressionModel(),
# 'GP_Matern': GaussianProcessRegressionModel(),
# 'GP_RationalQuadratic': GaussianProcessRegressionModel(),
'GP_RationalQuadratic': GaussianProcessRegressionModel(),
# 'GP_ExpSineSquared': GaussianProcessRegressionModel(),
# 'RBF_Linear': RadialBasisRegressionModel(),
# 'RBF_thinplatespline': RadialBasisRegressionModel(),
# 'RBF_cubic': RadialBasisRegressionModel(),
'RBF_Linear': RadialBasisRegressionModel(),
'RBF_thinplatespline': RadialBasisRegressionModel(),
'RBF_cubic': RadialBasisRegressionModel(),
# 'RBF_quintic': RadialBasisRegressionModel(),
# 'RBF_multiquadric': RadialBasisRegressionModel(),
# 'RBF_inversemultiquadric': RadialBasisRegressionModel(),
......
......@@ -26,7 +26,7 @@ else:
if args.plot:
print('Plotting is enabled')
DataFolder = f'Data/H_REFINEMENTS_{H_REFINEMENTS}'
print(f'Degree Elevation: \t{H_REFINEMENTS}')
print(f'Degree Elevation: \t{DEGREE_ELEVATIONS}')
print(f'H_REFINEMENTS: \t\t{H_REFINEMENTS}')
PatchesFolder = f'{DataFolder}/Patches'
......@@ -38,8 +38,8 @@ models = {
# 'GP_RationalQuadratic',
# 'GP_ExpSineSquared',
# 'RBF_Linear',
# 'RBF_thinplatespline',
# 'RBF_cubic',
'RBF_thinplatespline',
'RBF_cubic',
# 'RBF_quintic',
# 'RBF_multiquadric',
# 'RBF_inversemultiquadric',
......@@ -113,9 +113,9 @@ for model_name in models:
velocity_rec_data = get_solution_vectors(file_path=VELOCITY_REC_FILE, two_dimensional=True)
# Load the geometry
print(f'Geometry: \t\t{GEOMETRY_FILE}')
print(f'degree_elevations: \t{DEGREE_ELEVATIONS}')
print(f'h_refinements: \t{H_REFINEMENTS}')
# print(f'Geometry: \t\t{GEOMETRY_FILE}')
# print(f'degree_elevations: \t{DEGREE_ELEVATIONS}')
# print(f'h_refinements: \t{H_REFINEMENTS}')
microstructure, ms_vel = load_geometry(GEOMETRY_FILE, degree_elevations=DEGREE_ELEVATIONS, h_refinements=H_REFINEMENTS)
# Show pressure and velocity field
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
File added
File added
No preview for this file type
No preview for this file type
File deleted
File deleted
File deleted
File deleted
File deleted
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment