Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "mesh"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters_stage2.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"solver_type": "U_Pw",
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you revert the removal of the settings in the json? We still need the model_import_settings with the use_import_model_part (like you changed it before), it's just that we don't need the mdpa file itself anymore. This also holds for the other project params where you deleted this.

The tests still pass, that's true, but the reason we want to have use_input_model_part as input type, is to be able to simplify some code in the geomechanicsanalysis later (related to the orchestrator based workflow), so we still need it

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Unfortunately, model_import_settings cannot be empty, so "input_type": "mdpa" is added. mdpa can be omitted.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As in the other parameter files, the input_type should be put to use_input_model_part, such that the importer knows not to search for an mdpa file. Sorry if that wasn't clear (see next comment for clarity). The same holds for the other ones.

"input_type": "mdpa",
"input_filename": "line_body_all_stage_new_units_kPa_stage2"
},
"material_import_settings": {
"materials_filename": "MaterialParameters_stage2.json"
},
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"solver_type": "U_Pw",
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "simple_dike_test_with_gravity_umat_stage2"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
},
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "dirichlet_u"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "../Common/test"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "../Common/MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "1D-Consolidationtest"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"solver_type": "U_Pw",
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "mesh_stage2"
},
"material_import_settings": {
"materials_filename": "MaterialParameters2.json"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"solver_type": "Pw",
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "test_Transient_Case_A1_2D3N_stage2"
},
"material_import_settings": {
"materials_filename": "MaterialParameters_stage2.json"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"solver_type": "Pw",
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "test_Transient_Case_A1_2D3N_stage2"
},
"material_import_settings": {
"materials_filename": "MaterialParameters_stage2.json"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"solver_type": "Pw",
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "test_Transient_Case_B1_2D3N_stage2"
},
"material_import_settings": {
"materials_filename": "MaterialParameters_stage2.json"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"solver_type": "U_Pw",
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "simple_dike_test_with_gravity_umat_stage2"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
},
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name" : "PorousDomain",
"domain_size" : 2,
"model_import_settings": {
"input_type" : "mdpa",
"input_filename" : "column"
"input_type" : "use_input_model_part"
},
"material_import_settings": {
"materials_filename" : "../Common/MaterialParameters_stage2.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name" : "PorousDomain",
"domain_size" : 2,
"model_import_settings": {
"input_type" : "mdpa",
"input_filename" : "column"
"input_type" : "use_input_model_part"
},
"material_import_settings": {
"materials_filename" : "../Common/MaterialParameters_stage2.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name" : "PorousDomain",
"domain_size" : 2,
"model_import_settings": {
"input_type" : "mdpa",
"input_filename" : "column"
"input_type" : "use_input_model_part"
},
"material_import_settings": {
"materials_filename" : "../Common/MaterialParameters_stage2.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name" : "PorousDomain",
"domain_size" : 2,
"model_import_settings": {
"input_type" : "mdpa",
"input_filename" : "column"
"input_type" : "use_input_model_part"
},
"material_import_settings": {
"materials_filename" : "../Common/MaterialParameters_stage2.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name" : "PorousDomain",
"domain_size" : 2,
"model_import_settings": {
"input_type" : "mdpa",
"input_filename" : "column"
"input_type" : "use_input_model_part"
},
"material_import_settings": {
"materials_filename" : "../Common/MaterialParameters_stage2.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "test_model"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "test_model"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"model_part_name": "PorousDomain",
"domain_size": 2,
"model_import_settings": {
"input_type": "mdpa",
"input_filename": "test_model"
"input_type": "use_input_model_part"
},
"material_import_settings": {
"materials_filename": "MaterialParameters.json"
Expand Down
Loading