Merge branch 'master' of https://github.com/KratosMultiphysics/GiDInterface

Author: jginternational

.gitignore

@@ -11,4 +11,5 @@ kratos.gid/exec/Kratos*
 custom_tools/*
 .DS_Store
 
-*.zip
+*.zip
+*.tgz

kratos.gid/apps/PfemThermic/write/writeProjectParameters.tcl

@@ -7,14 +7,15 @@ proc PfemThermic::write::getNewParametersDict { } {
     PfemFluid::write::CalculateMyVariables
     set projectParametersDict [dict create]
 
-	dict set projectParametersDict analysis_stage "KratosMultiphysics.PfemFluidDynamicsApplication.pfem_fluid_dynamics_analysis"
-    dict set projectParametersDict problem_data         [PfemFluid::write::GetPFEM_ProblemDataDict]
-	dict set projectParametersDict solver_settings      [PfemThermic::write::GetSolverSettingsDict]
-	dict set projectParametersDict problem_process_list [PfemFluid::write::GetPFEM_ProblemProcessList [PfemThermic::write::GetFreeSurfaceHeatFluxParts] [PfemThermic::write::GetFreeSurfaceThermalFaceParts]]
-	dict set projectParametersDict processes            [PfemThermic::write::GetProcessList]
-    dict set projectParametersDict output_configuration [write::GetDefaultOutputGiDDict PfemFluid     [spdAux::getRoute Results]]
-    dict set projectParametersDict output_configuration result_file_configuration nodal_results       [write::GetResultsByXPathList [spdAux::getRoute NodalResults]]
-    dict set projectParametersDict output_configuration result_file_configuration gauss_point_results [write::GetResultsList ElementResults]
+	dict set   projectParametersDict analysis_stage "KratosMultiphysics.PfemFluidDynamicsApplication.pfem_fluid_dynamics_analysis"
+    dict set   projectParametersDict problem_data         [PfemFluid::write::GetPFEM_ProblemDataDict]
+	dict set   projectParametersDict solver_settings      [PfemThermic::write::GetSolverSettingsDict]
+	dict set   projectParametersDict problem_process_list [PfemFluid::write::GetPFEM_ProblemProcessList [PfemThermic::write::GetFreeSurfaceHeatFluxParts] [PfemThermic::write::GetFreeSurfaceThermalFaceParts]]
+	dict set   projectParametersDict processes            [PfemThermic::write::GetProcessList]
+    dict set   projectParametersDict output_configuration [write::GetDefaultOutputGiDDict PfemFluid     [spdAux::getRoute Results]]
+	dict unset projectParametersDict output_configuration folder_name
+    dict set   projectParametersDict output_configuration result_file_configuration nodal_results       [write::GetResultsByXPathList [spdAux::getRoute NodalResults]]
+    dict set   projectParametersDict output_configuration result_file_configuration gauss_point_results [write::GetResultsList ElementResults]
 
     return $projectParametersDict
 }

kratos.gid/apps/Structural/xml/SolutionStrategy.spd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <container n="SolStrat" pn="Solution" un="STStratSection" help="Solution Strategy" icon="solution" open_window="0">
-	<include n="Time" active="1" path="apps\Common\xml\TimeParametersWithSubstepping.spd" un="STTimeParameters" state="[checkStateByUniqueName STSoluType {Quasi-static Dynamic}]"/>
+	<include n="Time" active="1" path="apps/Common/xml/TimeParametersWithSubstepping.spd" un="STTimeParameters" state="[checkStateByUniqueName STSoluType {Quasi-static Dynamic}]"/>
 	<container n="StratParams" pn="Strategy parameters" un="STStratParams" icon="groupsTreeNew.gif" open_window="0" state="[HideIfUniqueName STSoluType eigen_value]">
 		<dynamicnode command="spdAux::injectSolStratParams" args="ImplementedInApplication StructuralMechanicsApplication"/>
 	</container>