Index: DamClients/DamPythonInterface/trunk/src/tests/test_input.py =================================================================== diff -u -r3518 -r3519 --- DamClients/DamPythonInterface/trunk/src/tests/test_input.py (.../test_input.py) (revision 3518) +++ DamClients/DamPythonInterface/trunk/src/tests/test_input.py (.../test_input.py) (revision 3519) @@ -449,3 +449,43 @@ model.ExportToXml(xml_file=xml_output) # test if file was created assert xml_output.is_file() + + @pytest.mark.integrationtest + def test_execute(self): + # Create surface lines + list_of_surface_lines = self.create_surface_lines() + # create soil class + soils = self.create_soils() + # Create stability parameters + test_stabilty_parameters = self.create_stability_parameters() + soil_profiles = self.create_profiles( + ["Dijkmateriaal", "Deklaag_klei", "wl_zand1"] + ) + segments = self.define_segment([soil_profiles[0].Name, soil_profiles[0].Name]) + locations = self.define_locations() + # Make input class + model = DamInput( + SurfaceLines=list_of_surface_lines, + Soils=soils, + StabilityParameters=test_stabilty_parameters, + SoilProfiles1D=soil_profiles, + Segments=segments, + Locations=locations, + StabilityModelType=StabilityType.UpliftVan, + FailureMechanismSystemType=FailureMechanismSystem.StabilityInside, + ProjectPath=Path(""), + ) + assert model + # run test + xml_dam_input = Path(TestUtils.get_output_test_data_dir(""), "InputFile.xml") + model.ExportToXml(xml_file=xml_dam_input) + # test if file was created + assert xml_dam_input.is_file() + # define output file location + xml_dam_output = Path(TestUtils.get_output_test_data_dir(""), "Outputxml.xml") + # run in the dam engine + result_code = model.execute( + xml_input_file=xml_dam_input, xml_output_file=xml_dam_output + ) + assert result_code == 0 + assert xml_dam_input.is_file() Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Version.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/DamConsoleRun.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/KellermanSoftware.Compare-NET-Objects.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamPiping.BlighCalculator.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Io.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/MPipingCalc2.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Data.Tests.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/nl-NL/Deltares.DamPiping.Sellmeijer4ForcesCalculator.resources.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamMacroStability.Calculator.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamPiping.Sellmeijer4ForcesCalculator.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/input.py =================================================================== diff -u -r3518 -r3519 --- DamClients/DamPythonInterface/trunk/src/dampythoninterface/input.py (.../input.py) (revision 3518) +++ DamClients/DamPythonInterface/trunk/src/dampythoninterface/input.py (.../input.py) (revision 3519) @@ -25,6 +25,7 @@ from pathlib import Path import lxml.etree as et from pydantic import validator +import os from .surface_line import SurfaceLine from .soil import Soil @@ -164,3 +165,25 @@ # Construct the whole input tree tree = et.ElementTree(input_root) tree.write(str(xml_file), pretty_print=True) + + def execute( + self, xml_input_file: Path, xml_output_file: Optional[Path] = None + ) -> int: + """ + Function that runs xml file with the DAM. + """ + executable_path = str( + Path( + Path(__file__).parent.resolve(), + "_recourses\DamEngine\DamConsoleRun.exe", + ) + ) + if xml_output_file is None: + xml_output = "" + else: + xml_output = " -o " + str(xml_output_file) + xml_input = " -i " + str(xml_input_file) + + # call console executable + result_code = os.system(executable_path + xml_input + xml_output) + return result_code Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Data.Tests.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Calculators.Tests.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.MacroStability.Kernel.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.Geo.Common.Standard.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.MacroStability.Io.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.MacroStability.CSharpWrapper.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/nunit.framework.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.StixFileWriter.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.MacroStability.Calculation.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/nl-NL/Deltares.DamPiping.SellmeijerVNKCalculator.resources.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Version.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.IntegrationTests.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.SoilStress.Data.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.WaternetCreator.Creator.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.MacroStability.Data.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.MacroStability.Interface.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/CommandLine.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Calculators.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.SearchAlgorithms.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.MacroStability.Preprocessing.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Interface.Tests.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Interface.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Interface.Tests.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.Geo.Common.Geometry.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/DamConsoleRun.exe.config =================================================================== diff -u --- DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/DamConsoleRun.exe.config (revision 0) +++ DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/DamConsoleRun.exe.config (revision 3519) @@ -0,0 +1,28 @@ + + + + + + + Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Io.Tests.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.IntegrationTests.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Data.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/DGSMStabDAM.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.TestHelpers.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Components.Persistence.Stability.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/DamConsoleRun.exe =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.SoilStress.Calculation.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Io.Tests.pdb =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.WTIPiping.Merged.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamPiping.SellmeijerVNKCalculator.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/nl-NL/Deltares.DamPiping.BlighCalculator.resources.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/Deltares.DamEngine.Calculators.Tests.dll =================================================================== diff -u Binary files differ Index: DamClients/DamPythonInterface/trunk/src/dampythoninterface/_recourses/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u Binary files differ