File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ proc CDEM::write::getParametersDict { } {
1919 set dem_strategy " ice_continuum_sphere_strategy"
2020 }
2121
22- dict set strategy_parameters_dict " strategy" $dem_strategy
22+ dict set project_parameters_dict " solver_settings " " strategy" $dem_strategy
2323
2424 dict set project_parameters_dict " DeltaOption" [write::getValue AdvOptions DeltaOption]
2525 dict set project_parameters_dict " SearchTolerance" [write::getValue AdvOptions TangencyToleranceValueAbsolute]
@@ -59,5 +59,6 @@ proc CDEM::write::GetGravity { } {
5959}
6060
6161proc CDEM::write::writeParametersEvent { } {
62- DEM::write::writeParametersEvent
62+ write::SetParallelismConfiguration
63+ write::WriteJSON [CDEM::write::getParametersDict]
6364}
Original file line number Diff line number Diff line change 2020# and maintains OLD_LD_LIBRARY_PATH with previous settings
2121# therefore, we use the OLD_LD_LIBRARY_PATH and prepend the path to the kratos libs
2222if [ " $OLD_LD_LIBRARY_PATH " != " " ]; then
23- export LD_LIBRARY_PATH=" $3 /exec/Kratos" :" $3 /exec/Kratos/libs" :$OLD_LD_LIBRARY_PATH
23+ export LD_LIBRARY_PATH=" $3 /exec/Kratos/bin/Release " :" $3 /exec/Kratos/bin/Release /libs" :$OLD_LD_LIBRARY_PATH
2424else
2525 # do not add the ':'
26- export LD_LIBRARY_PATH=" $3 /exec/Kratos" :" $3 /exec/Kratos/libs"
26+ export LD_LIBRARY_PATH=" $3 /exec/Kratos/bin/Release " :" $3 /exec/Kratos/bin/Release /libs"
2727fi
2828
2929# Prevents the PYTHONHOME error from happening and isolate possible python repacks present
3030# in the system and interfeering with runkratos
3131# export PYTHONHOME="$3/exec/Kratos"
32- export PYTHONPATH=" $3 /exec/Kratos/python34 .zip" :" $3 /exec/Kratos" :$PYTHONPATH
32+ export PYTHONPATH=" $3 /exec/Kratos/bin/Releasepython34 .zip" :" $3 /exec/Kratos/bin/Release " :$PYTHONPATH
3333
3434
3535# if mac
4444 KERNEL_NAME=" linux"
4545fi
4646
47+ echo $LD_LIBRARY_PATH
48+ echo $PYTHONPATH
49+
4750# Run Python using the script MainKratos.py
48- " $3 /exec/Kratos/runkratos" MainKratos.py > " $2 /$1 .info" 2> " $2 /$1 .err"
51+ " $3 /exec/Kratos/runkratos" MainKratos.py > " $2 /$1 .info" 2> " $2 /$1 .err"
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<!-- -*- coding: utf-8; mode: SGML -*- -->
3- <Kratos_data version =' 7.1.0 ' >
3+ <Kratos_data version =' 7.1.1 ' >
44 <style show_menubutton_about =' 0' show_menubutton_search =' 1' ></style >
55 <groups />
66 <units ></units >
You can’t perform that action at this time.
0 commit comments