Skip to content

Commit 1ef284b

Browse files
Set initial ids
1 parent 09b85b4 commit 1ef284b

4 files changed

Lines changed: 23 additions & 5 deletions

File tree

kratos.gid/apps/MdpaGenerator/start.tcl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@ proc ::MdpaGenerator::Init { app } {
1818

1919
::MdpaGenerator::xml::Init
2020
::MdpaGenerator::write::Init
21+
}
22+
23+
proc ::MdpaGenerator::BreakRunCalculation {} {
24+
return true
2125
}

kratos.gid/apps/MdpaGenerator/write/write.tcl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ proc ::MdpaGenerator::write::writeModelPartEvent { } {
4141

4242
# Custom SubmodelParts
4343
variable last_condition_iterator
44-
write::writeBasicSubmodelPartsByUniqueId $MdpaGenerator::write::ConditionMap $last_condition_iterator
44+
set conditions_mode [write::getValue SMP_write_options condition_write_mode]
45+
switch $conditions_mode {
46+
"unique" {}
47+
"repeat" {}
48+
"gid-id" {}
49+
default {}
50+
}
51+
write::writeBasicSubmodelPartsByUniqueId $MdpaGenerator::write::ConditionMap $last_condition_iterator
4552

4653
# Clean
4754
unset ::MdpaGenerator::write::ConditionMap
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<container n="MdpaGenerator" pn="MdpaGenerator" icon="app" prefix="MDPAGen_" tree_state="open" open_window="0">
3-
<container n="WriteOptions" pn="Write options" tree_state="open">
3+
<container n="WriteOptions" pn="Write options" tree_state="open" un="SMP_write_options">
44
<value n="condition_write_mode" pn="Condition mode" v='unique' values="unique,repeat,gid-id" dict="unique,Unique ids,repeat,Repeat,gid-id,GiD ids"
5-
help="Ids policy for conditions applied over the same entity more than one time."/>
5+
help="Ids policy for conditions applied over the same entity more than one time.">
6+
<dependencies value='unique' node="../value[@n='conditions_start_id']" att1='state' v1='normal' />
7+
<dependencies value='repeat' node="../value[@n='conditions_start_id']" att1='state' v1='normal' />
8+
<dependencies value='gid-id' node="../value[@n='conditions_start_id']" att1='state' v1='hidden' />
9+
</value>
10+
<value n="nodes_start_id" pn="Nodes start id" v="1" state="disabled"/>
11+
<value n="elements_start_id" pn="Elements start id" v="1" state="disabled"/>
12+
<value n="conditions_start_id" pn="Conditions start id" v="1"/>
613
</container>
714
<include n="GenericSubModelPart" active="1" path="apps/Common/xml/GenericSubModelPart.spd"/>
815
</container>

kratos.gid/kratos.tcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,8 @@ proc Kratos::Event_BeforeRunCalculation { batfilename basename dir problemtypedi
471471
if {!$run} {
472472
return [list "-cancel-" [= "You have selected MPI parallelism system.\nInput files have been written.\nRun the MPILauncher.sh script" ]]
473473
}
474-
set app_run_brake [apps::ExecuteOnCurrentApp BeforeRunCalculation]
475-
if {$app_run_brake}
474+
set app_run_brake [apps::ExecuteOnCurrentApp BreakRunCalculation]
475+
if {[write::isBooleanTrue $app_run_brake]} {return "-cancel-"}
476476
}
477477

478478
proc Kratos::Event_AfterWriteCalculationFile { filename errorflag } {

0 commit comments

Comments
 (0)