Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

# Importing the Kratos Library
import KratosMultiphysics
from KratosMultiphysics.kratos_utilities import IssueDeprecationWarning
from KratosMultiphysics.RomApplication.randomized_singular_value_decomposition import RandomizedSingularValueDecomposition

def Factory(settings, model):
Expand All @@ -18,6 +19,8 @@ class CalculateRomBasisOutputProcess(KratosMultiphysics.OutputProcess):
def __init__(self, model, settings):
KratosMultiphysics.OutputProcess.__init__(self)

IssueDeprecationWarning("CalculateRomBasisOutputProcess", "This process is deprecated and will be removed. Please use the RomManager to compute the ROM basis.")

# Validate input settings against defaults
settings.ValidateAndAssignDefaults(self.GetDefaultParameters())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from os import remove
from pathlib import Path

def CreateRomAnalysisInstance(cls, global_model, parameters, nn_rom_interface=None):
def CreateRomAnalysisInstance(cls, global_model, parameters, nn_rom_interface=None, rom_basis_output_folder=None, rom_basis_output_name=None):
class RomAnalysis(cls):

def __init__(self,global_model, parameters):
Expand All @@ -34,6 +34,11 @@ def _CreateSolver(self):
self.rom_basis_output_name = parameter_set["Parameters"]["rom_basis_output_name"].GetString()
if parameter_set["Parameters"].Has("rom_basis_output_folder"):
self.rom_basis_output_folder = parameter_set["Parameters"]["rom_basis_output_folder"].GetString()
# Explicitly provided values (e.g. from the RomManager) take precedence
if rom_basis_output_name is not None:
self.rom_basis_output_name = rom_basis_output_name
if rom_basis_output_folder is not None:
self.rom_basis_output_folder = rom_basis_output_folder
self.rom_basis_output_name = Path(self.rom_basis_output_name)
self.rom_basis_output_folder = Path(self.rom_basis_output_folder)

Expand Down
230 changes: 131 additions & 99 deletions applications/RomApplication/python_scripts/rom_manager.py

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import KratosMultiphysics
import KratosMultiphysics.RomApplication.rom_analysis

def SetUpSimulationInstance(model, parameters, nn_rom_interface=None):
def SetUpSimulationInstance(model, parameters, nn_rom_interface=None, rom_basis_output_folder=None, rom_basis_output_name=None):
""" Creates and returns a ROM simulation instance """

# Get the parent simulation class
Expand All @@ -22,7 +22,9 @@ def SetUpSimulationInstance(model, parameters, nn_rom_interface=None):
analysis_stage_class,
model,
parameters,
nn_rom_interface=nn_rom_interface)
nn_rom_interface=nn_rom_interface,
rom_basis_output_folder=rom_basis_output_folder,
rom_basis_output_name=rom_basis_output_name)

return simulation

Expand Down
Binary file not shown.
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,7 @@
},
"output_processes" : {
"gid_output" : [],
"vtk_output" : [],
"rom_output": [{
"python_module" : "calculate_rom_basis_output_process",
"kratos_module" : "KratosMultiphysics.RomApplication",
"process_name" : "CalculateRomBasisOutputProcess",
"Parameters": {
"model_part_name": "FluidModelPart",
"snapshots_control_type": "step",
"snapshots_interval": 1.0,
"nodal_unknowns": ["VELOCITY_X","VELOCITY_Y","PRESSURE"],
"rom_basis_output_format": "numpy",
"rom_basis_output_name": "RomParameters",
"svd_truncation_tolerance": 1e-6
}
}]
"vtk_output" : []
},
"solver_settings" : {
"model_part_name" : "FluidModelPart",
Expand Down
4 changes: 0 additions & 4 deletions applications/RomApplication/tests/test_RomApplication.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
from test_structural_rom import TestStructuralRom
from test_randomized_singular_value_decomposition import TestRandomizedSVD
from test_empirical_cubature_method import TestEmpiricalCubatureMethod
from test_calculate_rom_basis_output_process_json import TestCalculateRomBasisOutputProcessJSON
from test_calculate_rom_basis_output_process_numpy import TestCalculateRomBasisOutputProcessNumpy
from test_compressible_potiential_rom import TestCompressiblePotentialRom
from test_fluid_lspg_rom import TestFluidLSPGRom
from test_thermal_lspg_rom import TestThermalLSPGRom
Expand Down Expand Up @@ -52,8 +50,6 @@ def AssembleTestSuites():
smallSuite.addTests(KratosUnittest.TestLoader().loadTestsFromTestCases([TestFluidRom]))
smallSuite.addTests(KratosUnittest.TestLoader().loadTestsFromTestCases([TestThermalRom]))
smallSuite.addTests(KratosUnittest.TestLoader().loadTestsFromTestCases([TestStructuralRom]))
smallSuite.addTests(KratosUnittest.TestLoader().loadTestsFromTestCases([TestCalculateRomBasisOutputProcessJSON]))
smallSuite.addTests(KratosUnittest.TestLoader().loadTestsFromTestCases([TestCalculateRomBasisOutputProcessNumpy]))
smallSuite.addTest(TestRandomizedSVD('test_radomized_svd'))
smallSuite.addTest(TestEmpiricalCubatureMethod('test_empirical_cubature_method'))
smallSuite.addTests(KratosUnittest.TestLoader().loadTestsFromTestCases([TestCompressiblePotentialRom]))
Expand Down

This file was deleted.

Loading