diff --git a/kratos.gid/apps/PfemFluid/write/write.tcl b/kratos.gid/apps/PfemFluid/write/write.tcl
index 2e343300a..44cf937de 100644
--- a/kratos.gid/apps/PfemFluid/write/write.tcl
+++ b/kratos.gid/apps/PfemFluid/write/write.tcl
@@ -13,7 +13,7 @@ proc PfemFluid::write::Init { } {
set bodies_list [list ]
variable Names
set Names [dict create DeltaTime DeltaTime]
-
+
SetAttribute properties_location json
SetAttribute model_part_name "PfemFluidModelPart"
SetAttribute materials_file "PFEMFluidMaterials.json"
@@ -24,17 +24,17 @@ proc PfemFluid::write::Init { } {
proc PfemFluid::write::writeModelPartEvent { } {
# Init data
write::initWriteConfiguration [GetAttributes]
-
+
set parts_un_list [GetPartsUN]
foreach part_un $parts_un_list {
write::initWriteData $part_un "PFEMFLUID_Materials"
}
-
+
write::writeModelPartData
write::WriteString "Begin Properties 0"
write::WriteString "End Properties"
# write::writeMaterials "PfemFluid"
-
+
write::writeNodalCoordinates
foreach part_un $parts_un_list {
write::initWriteData $part_un "PFEMFLUID_Materials"
@@ -44,21 +44,21 @@ proc PfemFluid::write::writeModelPartEvent { } {
}
proc PfemFluid::write::writeMeshes { } {
-
+
foreach part_un [GetPartsUN] {
write::initWriteData $part_un "PFEMFLUID_Materials"
write::writePartSubModelPart
}
# Solo Malla , no en conditions
writeNodalConditions "PFEMFLUID_NodalConditions"
-
+
}
proc PfemFluid::write::writeNodalConditions { keyword } {
write::writeNodalConditions $keyword
return ""
-
+
set root [customlib::GetBaseRoot]
set xp1 "[spdAux::getRoute $keyword]/container/blockdata"
set groups [$root selectNodes $xp1]
@@ -98,11 +98,11 @@ proc PfemFluid::write::GetPartsUN { } {
# Custom files (Copy python scripts, write materials file...)
proc PfemFluid::write::writeCustomFilesEvent { } {
# Write the fluid materials json file
- PfemFluid::write::WriteMaterialsFile False
-
+ PfemFluid::write::WriteMaterialsFile
+
write::CopyFileIntoModel "python/RunPFEM.py"
write::RenameFileInModel "RunPFEM.py" "MainKratos.py"
-
+
#write::RenameFileInModel "ProjectParameters.json" "ProjectParameters.py"
}
diff --git a/kratos.gid/apps/PfemFluid/xml/ConstitutiveLaws.xml b/kratos.gid/apps/PfemFluid/xml/ConstitutiveLaws.xml
index 238716ff8..379e3aff1 100644
--- a/kratos.gid/apps/PfemFluid/xml/ConstitutiveLaws.xml
+++ b/kratos.gid/apps/PfemFluid/xml/ConstitutiveLaws.xml
@@ -1,16 +1,28 @@
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -22,7 +34,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -36,7 +77,87 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -45,4 +166,5 @@
+
diff --git a/kratos.gid/apps/PfemFluid/xml/Elements.xml b/kratos.gid/apps/PfemFluid/xml/Elements.xml
index 4dd668972..8d3a2ad49 100644
--- a/kratos.gid/apps/PfemFluid/xml/Elements.xml
+++ b/kratos.gid/apps/PfemFluid/xml/Elements.xml
@@ -15,7 +15,8 @@
-
+
+
@@ -41,7 +42,8 @@
-
+
+
@@ -61,23 +63,24 @@
help="To be written by..."
ElementType="Fluid" Dofs="VELOCITY,PRESSURE">
-
-
-