Merge pull request #864 from KratosMultiphysics/dam/move_towards_Main…

…Kratos [Dam] Customize the DamApplicaiton to use the common Kratos analysis
KratosMultiphysics · Feb 9, 2022 · 77ed742 · 77ed742
2 parents 626c849 + c9fc824
commit 77ed742
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/kratos.gid/apps/Dam/app.json b/kratos.gid/apps/Dam/app.json
@@ -47,6 +47,6 @@
         "properties_location": "mdpa",
         "model_part_name": "MainModelPart"
     },
-    "main_launch_file": "python/MainKratos.py",
+    "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"
 }
diff --git a/kratos.gid/apps/Dam/write/writeProjectParameters.tcl b/kratos.gid/apps/Dam/write/writeProjectParameters.tcl
@@ -7,6 +7,9 @@ proc ::Dam::write::getParametersDict { } {
 
     set projectParametersDict [dict create]
 
+   # Analysis stage field
+    dict set projectParametersDict analysis_stage "KratosMultiphysics.DamApplication.dam_analysis"
+
     ### Problem data
     dict set projectParametersDict problem_data [Dam::write::GetProblemDataDict]
 

diff --git a/kratos.gid/apps/Dam/xml/Conditions.xml b/kratos.gid/apps/Dam/xml/Conditions.xml
@@ -5,7 +5,7 @@
 
   <!---  Conditions: YOUNG VARIABLE -->
   <ConditionItem n="YoungModulus3D" pn="Young Modulus Calibration" ImplementedInFile="process_factory"  TypeofProblem="Mechanical,Thermo-Mechanical"
-	ImplementedInApplication="DamApplication" MinimumKratosVersion="13000" ProductionReady="ProductionReady" TypeofCondition="Calibration"
+	ImplementedInApplication="DamApplication" MinimumKratosVersion="13000" ProductionReady="ProductionReady" TypeofCondition="Mechanical"
 	WorkingSpaceDimension="3D" LocalSpaceDimension="0" RequiresLocalAxes="False" LargeDeformation="False"
 	ElementType="Volume" ProcessName="ImposeInputTableNodalYoungModulusProcess" VariableName="NODAL_YOUNG_MODULUS"
     help="Application of variable young modulus in the nodes">
@@ -20,7 +20,7 @@
   </ConditionItem>
 
  <ConditionItem n="YoungModulus2D" pn="Young Modulus Calibration" ImplementedInFile="process_factory"  TypeofProblem="Mechanical,Thermo-Mechanical"
-	ImplementedInApplication="DamApplication" MinimumKratosVersion="13000" ProductionReady="ProductionReady" TypeofCondition="Calibration"
+	ImplementedInApplication="DamApplication" MinimumKratosVersion="13000" ProductionReady="ProductionReady" TypeofCondition="Mechanical"
 	WorkingSpaceDimension="2D" LocalSpaceDimension="0" RequiresLocalAxes="False" LargeDeformation="False"
 	ElementType="Surface" ProcessName="ImposeInputTableNodalYoungModulusProcess" VariableName="NODAL_YOUNG_MODULUS"
     help="Application of variable young modulus in the nodes">