Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pfem interface compatible with kratos master #139

Merged
merged 3 commits into from
Aug 2, 2017
Merged

pfem interface compatible with kratos master #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7063db1
update pfem after changing names
josep-m-carbonell Jul 29, 2017
aa77e7a
Merge branch 'master' into feature-pfem-update
josep-m-carbonell Aug 1, 2017
1819796
Pfem nodal results and default values
jginternational Aug 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kratos.gid/apps/Pfem/python/RunPFEM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import KratosMultiphysics
import KratosMultiphysics.PfemApplication
import KratosMultiphysics.PfemFluidDynamicsApplication
import MainFluidPFEM

Expand Down
2 changes: 1 addition & 1 deletion kratos.gid/apps/Pfem/python/script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def GetParallelSize():
import KratosMultiphysics
import KratosMultiphysics.SolidMechanicsApplication as KratosSolid
import KratosMultiphysics.ExternalSolversApplication as KratosSolvers
import KratosMultiphysics.PfemBaseApplication as KratosPfemBase
import KratosMultiphysics.PfemApplication as KratosPfemg
import KratosMultiphysics.ContactMechanicsApplication as KratosContact
import KratosMultiphysics.PfemSolidMechanicsApplication as KratosPfemSolid
import KratosMultiphysics.PfemFluidDynamicsApplication as KratosPfemFluid
Expand Down
2 changes: 1 addition & 1 deletion kratos.gid/apps/Pfem/write/ProjectParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"problem_process_list" : [{
"python_module" : "remesh_domains_process",
"kratos_module" : "KratosMultiphysics.PfemBaseApplication",
"kratos_module" : "KratosMultiphysics.PfemApplication",
"help" : "This process applies meshing to the problem domains",
"process_name" : "RemeshDomainsProcess",
"Parameters" : {
Expand Down
6 changes: 3 additions & 3 deletions kratos.gid/apps/Pfem/write/writeProjectParameters.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ proc Pfem::write::GetPFEM_RemeshDict { } {
variable bodies_list
set resultDict [dict create ]
dict set resultDict "help" "This process applies meshing to the problem domains"
dict set resultDict "kratos_module" "KratosMultiphysics.PfemBaseApplication"
dict set resultDict "kratos_module" "KratosMultiphysics.PfemApplication"
dict set resultDict "python_module" "remesh_domains_process"
dict set resultDict "process_name" "RemeshDomainsProcess"

Expand Down Expand Up @@ -322,7 +322,7 @@ proc Pfem::write::GetPFEM_FluidRemeshDict { } {
variable bodies_list
set resultDict [dict create ]
dict set resultDict "help" "This process applies meshing to the problem domains"
dict set resultDict "kratos_module" "KratosMultiphysics.PfemBaseApplication"
dict set resultDict "kratos_module" "KratosMultiphysics.PfemApplication"
set problemtype [write::getValue PFEM_DomainType]

dict set resultDict "python_module" "remesh_fluid_domains_process"
Expand Down Expand Up @@ -492,7 +492,7 @@ proc Pfem::write::GetNodalDataDict { } {
set groupid [$group @n]
set processDict [dict create]
dict set processDict process_name "ApplyValuesToNodes"
dict set processDict kratos_module "KratosMultiphysics.PfemBaseApplication"
dict set processDict kratos_module "KratosMultiphysics.PfemApplication"

set params [dict create]
set xp2 "./value"
Expand Down
8 changes: 7 additions & 1 deletion kratos.gid/apps/Pfem/xml/GetFromXML.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ proc Pfem::xml::Init { } {

Model::getSolutionStrategies Strategies.xml
Model::getElements Elements.xml
Model::getConstitutiveLaws "../../Solid/xml/ConstitutiveLaws.xml"
Model::getConstitutiveLaws "../../Pfem/xml/ConstitutiveLaws.xml"
Model::getConstitutiveLaws "../../Solid/xml/ConstitutiveLaws.xml"
Model::getProcesses "../../Solid/xml/Processes.xml"
Model::getProcesses "../../Common/xml/Processes.xml"
Model::getProcesses Processes.xml
Expand Down Expand Up @@ -82,6 +82,12 @@ proc Pfem::xml::CustomTree { args } {
#boundary conditions
spdAux::SetValueOnTreeItem state \[CheckNodalConditionStatePFEM\] PFEM_NodalConditions VELOCITY
spdAux::SetValueOnTreeItem state \[CheckNodalConditionStatePFEM\] PFEM_NodalConditions PRESSURE

#nodal results
spdAux::SetValueOnTreeItem v Yes NodalResults VELOCITY
spdAux::SetValueOnTreeItem v Yes NodalResults PRESSURE
spdAux::SetValueOnTreeItem v No NodalResults DISPLACEMENT


foreach node [[customlib::GetBaseRoot] selectNodes "[spdAux::getRoute PFEM_NodalConditions]/condition" ] {
$node setAttribute icon folder
Expand Down