Merge remote-tracking branch 'origin/pfemFluid_erase_Solid_dependencies' into pfemFluid_erase_Solid_dependencies

Author: AFranci

kratos.gid/apps/PfemFluid/xml/Main.spd

@@ -3,7 +3,7 @@
     <include n="ModelType" active="1" path="apps/PfemFluid/xml/ModelType.spd"/>
     <include n="Bodies" active="1" path="apps/PfemFluid/xml/Bodies.spd"/>
     <include n="BoundaryConditions" active="1" path="apps/PfemFluid/xml/NodalConditions.spd"/>
-    <include n="Loads" active="1" path="apps/Solid/xml/Loads.spd" state="[getStateFromXPathValue {string(../container[@n='ModelType']/value[@n='DomainType']/@v)} Solids,Coupled]"/>
+    <include n="Loads" active="1" path="apps/Solid/xml/Loads.spd" state="[getStateFromXPathValue {string(../container[@n='ModelType']/value[@n='DomainType']/@v)} FSI]"/>
     <include n="TimeSettings" active="1" icon="timeParams" path="apps/PfemFluid/xml/TimeSettings.spd"/>
     <include n="Gravity" active="1" icon="gravityForce" path="apps/PfemFluid/xml/Gravity.spd"/>
     <include n="MeshBoxes" active="1" icon="boundingBox" path="apps/PfemFluid/xml/MeshBoxes.spd"/>                   

kratos.gid/apps/PfemFluid/xml/XmlController.tcl

@@ -14,11 +14,11 @@ proc PfemFluid::xml::Init { } {
     Model::getSolutionStrategies Strategies.xml
     Model::getElements Elements.xml
     Model::getConstitutiveLaws ConstitutiveLaws.xml
-    # Model::getProcesses "../../Solid/xml/Processes.xml"
+    Model::getProcesses "../../Solid/xml/Processes.xml"
     Model::getProcesses "../../Common/xml/Processes.xml"
     Model::getProcesses Processes.xml
     Model::getNodalConditions NodalConditions.xml
-    # Model::getConditions "../../Solid/xml/Conditions.xml"
+    Model::getConditions "../../Solid/xml/Conditions.xml"
     Model::getSolvers "../../Pfem/xml/Solvers.xml"
 
     Model::ForgetNodalCondition "CONTACT"