Skip to content

Commit 39b934d

Browse files
AFranciAFranci
authored
Merge pull request #673 from KratosMultiphysics/pfemFluid_erase_Solid_dependencies
[PfemFluid] changes in dependencies
2 parents fbbf8f7 + e7aa4ff commit 39b934d

15 files changed

Lines changed: 50 additions & 634 deletions

‎kratos.gid/apps/Pfem/xml/NodalConditions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<NodalConditionList>
33
<NodalConditionItem n="INLET" pn="Inlet" ProcessName="AssignInletProcess" VariableName="VELOCITY" Interval="Total"
4-
unit_magnitude="Velocity" units="m/s" App="Pfem" kratos_module="PfemApplication" state="CheckNodalConditionStatePFEM" ov="[CheckGeometry 2]">
4+
unit_magnitude="Velocity" units="m/s" App="Pfem" kratos_module="PfemFluidDynamicsApplication" state="CheckNodalConditionStatePFEM" ov="[CheckGeometry 2]">
55
</NodalConditionItem>
66
</NodalConditionList>

‎kratos.gid/apps/Pfem/xml/Processes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ProcessList>
3-
<Process n="AssignInletProcess" pn="Assign a vector value process" python_module="assign_inlet_process" kratos_module="KratosMultiphysics.PfemApplication" help="This process fixes the selected components of a given vector variable">
3+
<Process n="AssignInletProcess" pn="Assign a vector value process" python_module="assign_inlet_process" kratos_module="KratosMultiphysics.PfemFluidDynamicsApplication" help="This process fixes the selected components of a given vector variable">
44
<inputs>
55
<parameter n="value" pn="Component" type="vector" vectorType="double" function="1" cv="ByValue,ByValue,ByValue" v="0.0,0.0,0.0" fv="2*x,2*y*t,0.5*z" has_units="1"/>
66
<!-- <parameter n="value" pn="Value" type="vector" vectorType="double" enabled="1" function="1" v="0.0,0.0,0.0" has_units="1" help="Vector value"/> -->

‎kratos.gid/apps/PfemFluid/images/exampleFluid.png‎

1.5 KB
Loading

‎kratos.gid/apps/PfemFluid/images/exampleFsi.png‎

1.49 KB
Loading

‎kratos.gid/apps/PfemFluid/python/Erase--script.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,8 @@ def GetParallelSize():
4646

4747
# Import kratos core and applications
4848
import KratosMultiphysics
49-
import KratosMultiphysics.SolidMechanicsApplication as KratosSolid
5049
import KratosMultiphysics.ExternalSolversApplication as KratosSolvers
5150
import KratosMultiphysics.DelaunayMeshingApplication as KratosPfemg
52-
import KratosMultiphysics.ContactMechanicsApplication as KratosContact
53-
import KratosMultiphysics.PfemSolidMechanicsApplication as KratosPfemSolid
5451
import KratosMultiphysics.PfemFluidDynamicsApplication as KratosPfemFluid
5552

5653
######################################################################################
@@ -103,10 +100,6 @@ def GetParallelSize():
103100
# Add variables (always before importing the model part)
104101
solver.AddVariables()
105102

106-
# Add PfemSolidMechanicsApplication Variables
107-
import pfem_solid_variables
108-
pfem_solid_variables.AddVariables(main_model_part)
109-
110103
# Read model_part (note: the buffer_size is set here) (restart is read here)
111104
solver.ImportModelPart()
112105

‎kratos.gid/apps/PfemFluid/python/RunPFEM.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import KratosMultiphysics.ExternalSolversApplication
33
import KratosMultiphysics.DelaunayMeshingApplication
44
import KratosMultiphysics.PfemFluidDynamicsApplication
5-
import KratosMultiphysics.SolidMechanicsApplication
65

76
from KratosMultiphysics.PfemFluidDynamicsApplication.pfem_fluid_dynamics_analysis import PfemFluidDynamicsAnalysis
87

‎kratos.gid/apps/PfemFluid/start.tcl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ proc ::PfemFluid::LoadMyFiles { } {
2727
variable dir
2828
uplevel #0 [list source [file join $dir examples examples.tcl]]
2929
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
30-
uplevel #0 [list source [file join $dir .. Solid write write.tcl]]
3130
uplevel #0 [list source [file join $dir write write.tcl]]
3231
uplevel #0 [list source [file join $dir write writeProjectParameters.tcl]]
3332
}
@@ -54,9 +53,9 @@ proc ::PfemFluid::CustomToolbarItems { } {
5453
Kratos::ToolbarAddItem "Output" [file join $img_dir "view.png"] [list -np- PWViewOutput] [= "View process info"]
5554
Kratos::ToolbarAddItem "Stop" [file join $img_dir "cancelProcess.png"] {Utilities CancelProcess} [= "Cancel process"]
5655
Kratos::ToolbarAddItem "SpacerApp" "" "" ""
57-
58-
Kratos::ToolbarAddItem "Example" "example.png" [list -np- ::PfemFluid::examples::WaterDamBreak] [= "Example\nWater dam break"]
59-
Kratos::ToolbarAddItem "Example" "example.png" [list -np- ::PfemFluid::examples::DamBreakFSI] [= "Example\nDam break FSI"]
56+
Kratos::ToolbarAddItem "Spacer" "" "" ""
57+
Kratos::ToolbarAddItem "Example" [file join $img_dir "exampleFluid.png"] [list -np- ::PfemFluid::examples::WaterDamBreak] [= "Example\nWater dam break"]
58+
Kratos::ToolbarAddItem "Example" [file join $img_dir "exampleFsi.png"] [list -np- ::PfemFluid::examples::DamBreakFSI] [= "Example\nDam break FSI"]
6059

6160
# Solo para JG
6261
if {[GiD_Info problemtypepath] eq "E:/PROYECTOS/Kratos/interfaces/GiD/kratos.gid"} {

‎kratos.gid/apps/PfemFluid/write/ProjectParameters.json‎

Lines changed: 2 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -117,144 +117,10 @@
117117
}
118118
]
119119
}
120-
},{
121-
"python_module" : "parametric_walls_process",
122-
"kratos_module" : "KratosMultiphysics.ContactMechanicsApplication",
123-
"help" : "This process applies parametric walls and search contact",
124-
"process_name" : "ParametricWallsProcess",
125-
"Parameters" : {
126-
"model_part_name" : "Solid Domain",
127-
"search_control_type" : "step",
128-
"search_frequency" : 1.0,
129-
"parametric_walls" : [
130-
{
131-
"python_module": "parametric_wall",
132-
"model_part_name" : "model_part_name",
133-
"rigid_body_settings":{
134-
"rigid_body_element_type": "TranslatoryRigidElement3D1N",
135-
"fixed_body": true,
136-
"compute_body_parameters": false,
137-
"rigid_body_model_part_name": "model_part_name",
138-
"rigid_body_parameters":{
139-
"center_of_gravity": [0.0 ,0.0, 0.0],
140-
"mass":0.0,
141-
"main_inertias": [0.0, 0.0, 0.0],
142-
"main_axes": [ [1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0] ]
143-
}
144-
},
145-
"bounding_box_settings":{
146-
"kratos_module": "KratosMultiphysics.ContactMechanicsApplication",
147-
"bounding_box_type": "SpatialBoundingBox",
148-
"bounding_box_parameters":{
149-
"parameters_list":[],
150-
"velocity" : [0.0, 0.0, 0.0]
151-
}
152-
},
153-
"contact_search_settings":{
154-
"kratos_module": "KratosMultiphysics.ContactMechanicsApplication",
155-
"contact_search_type": "ParametricWallContactSearch",
156-
"contact_parameters":{
157-
"contact_condition_type": "PointContactCondition2D1N",
158-
"friction_law_type": "FrictionLaw",
159-
"kratos_module": "KratosMultiphysics.ContactMechanicsApplication",
160-
"variables_of_properties":{
161-
"FRICTION_ACTIVE": false,
162-
"MU_STATIC": 0.3,
163-
"MU_DYNAMIC": 0.2,
164-
"PENALTY_PARAMETER": 1000,
165-
"TANGENTIAL_PENALTY_RATIO": 0.1,
166-
"TAU_STAB": 1
167-
}
168-
}
169-
}
170-
}
171-
172-
]
173-
}
174-
},{
175-
"help" : "This process creates the rigid bodies of the model",
176-
"kratos_module": "KratosMultiphysics.ContactMechanicsApplication",
177-
"python_module": "rigid_bodies_process",
178-
"process_name" : "RigidBodyProcess",
179-
"Parameters" : {
180-
"model_part_name" : "Main_Domain",
181-
"rigid_bodies" : [
182-
{
183-
"python_module" : "rigid_body",
184-
"model_part_name": "Rigid_Body_Volume",
185-
"rigid_body_settings":{
186-
"rigid_body_element_type": "RigidBodyElement2D1N",
187-
"fixed_body": false,
188-
"compute_body_parameters": true,
189-
"rigid_body_model_part_name": "Rigid_Body_Volume",
190-
"rigid_body_parameters":{
191-
"center_of_gravity": [0,0,0],
192-
"mass": 0,
193-
"main_inertias": [0, 0, 0],
194-
"main_axes": [ [1,0,0], [0,1,0], [0,0,1] ]
195-
}
196-
}
197-
},
198-
{
199-
"python_module" : "rigid_body",
200-
"model_part_name": "Rigid_Body_Surface",
201-
"rigid_body_settings":{
202-
"rigid_body_element_type": "RigidBodyElement2D1N",
203-
"fixed_body": false,
204-
"compute_body_parameters": false,
205-
"rigid_body_model_part_name": "Rigid_Body_Surface",
206-
"rigid_body_parameters":{
207-
"center_of_gravity": [2,0,0],
208-
"mass": 1,
209-
"main_inertias": [1, 1, 1],
210-
"main_axes": [ [1,0,0], [0,1,0], [0,0,1] ]
211-
}
212-
}
213-
}
214-
]
215-
}
216-
},{
217-
"python_module" : "contact_domain_process",
218-
"kratos_module" : "KratosMultiphysics.ContactMechanicsApplication",
219-
"help" : "This process applies contact domain search by remeshing outer boundaries",
220-
"process_name" : "ContactDomainProcess",
221-
"Parameters" : {
222-
"model_part_name" : "model_part_name",
223-
"meshing_control_type" : "step",
224-
"meshing_frequency" : 1.0,
225-
"meshing_before_output" : true,
226-
"meshing_domains" : [
227-
{
228-
"python_module": "contact_domain",
229-
"model_part_name": "sub_model_part_name",
230-
"alpha_shape": 1.4,
231-
"offset_factor": 0.0,
232-
"meshing_strategy":{
233-
"python_module": "contact_meshing_strategy",
234-
"meshing_frequency": 0,
235-
"remesh": true,
236-
"constrained": false,
237-
"contact_parameters":{
238-
"contact_condition_type": "ContactDomainLM2DCondition",
239-
"friction_law_type": "FrictionLaw",
240-
"kratos_module": "KratosMultiphysics.ContactMechanicsApplication",
241-
"variables_of_properties":{
242-
"FRICTION_ACTIVE": false,
243-
"MU_STATIC": 0.3,
244-
"MU_DYNAMIC": 0.2,
245-
"PENALTY_PARAMETER": 1000,
246-
"TANGENTIAL_PENALTY_RATIO": 0.1,
247-
"TAU_STAB": 1
248-
}
249-
}
250-
},
251-
}
252-
]
253-
}
254120
}],
255121
"constraints_process_list" : [{
256122
"python_module" : "assign_value_to_vector_components_process",
257-
"kratos_module" : "KratosMultiphysics.SolidMechanicsApplication",
123+
"kratos_module" : "KratosMultiphysics.PfemFluidDynamicsApplication",
258124
"help" : "This process imposes a constraint",
259125
"process_name" : "AssignValueToVectorComponentsProcess",
260126
"Parameters" : {
@@ -268,7 +134,7 @@
268134
}],
269135
"loads_process_list" : [{
270136
"python_module" : "assign_vector_to_conditions_process",
271-
"kratos_module" : "KratosMultiphysics.SolidMechanicsApplication",
137+
"kratos_module" : "KratosMultiphysics.PfemFluidDynamicsApplication",
272138
"help" : "This process assigns a load value on conditions",
273139
"process_name" : "AssignVectorToConditionsProcess",
274140
"Parameters" : {
@@ -280,21 +146,6 @@
280146
"direction" : [0.0,-1.0,0.0]
281147
}
282148
}],
283-
"output_process_list" : [{
284-
"python_module" : "restart_process",
285-
"kratos_module" : "KratosMultiphysics.SolidMechanicsApplication",
286-
"help" : "This process writes restart files",
287-
"process_name" : "RestartProcess",
288-
"Parameters" : {
289-
"model_part_name" : "Main Model",
290-
"save_restart" : true,
291-
"restart_file_name" : "cutting_test_rigid_2D_json",
292-
"restart_file_label" : "step",
293-
"output_control_type" : "time",
294-
"output_frequency" : 0,
295-
"json_output" : false
296-
}
297-
}],
298149
"output_configuration" : {
299150
"result_file_configuration" : {
300151
"gidpost_flags" : {

‎kratos.gid/apps/PfemFluid/write/write.tcl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ proc PfemFluid::write::Init { } {
99
set remesh_domains [dict create ]
1010
variable bodies_list
1111
set bodies_list [list ]
12-
Solid::write::AddValidApps "PfemFluid"
1312
variable Names
1413
set Names [dict create DeltaTime DeltaTime]
1514
}
@@ -32,7 +31,6 @@ proc PfemFluid::write::writeModelPartEvent { } {
3231
write::initWriteData $part_un "PFEMFLUID_Materials"
3332
write::writeElementConnectivities
3433
}
35-
Solid::write::writeConditions
3634
PfemFluid::write::writeMeshes
3735
}
3836

@@ -45,8 +43,6 @@ proc PfemFluid::write::writeMeshes { } {
4543
# Solo Malla , no en conditions
4644
writeNodalConditions "PFEMFLUID_NodalConditions"
4745

48-
# A Condition y a meshes-> salvo lo que no tenga topologia
49-
Solid::write::writeLoads
5046
}
5147

5248

@@ -92,7 +88,6 @@ proc PfemFluid::write::GetPartsUN { } {
9288

9389
# Custom files (Copy python scripts, write materials file...)
9490
proc PfemFluid::write::writeCustomFilesEvent { } {
95-
Solid::write::WriteMaterialsFile
9691

9792
write::CopyFileIntoModel "python/RunPFEM.py"
9893
write::RenameFileInModel "RunPFEM.py" "MainKratos.py"

0 commit comments

Comments
 (0)