Skip to content

Commit

Permalink
Merge branch 'UpdateFixedTimeSteppingInPrj' into 'master'
Browse files Browse the repository at this point in the history 
Update time stepping config to reflect actually taken time steps

See merge request ogs/ogs!4684
  • Loading branch information
@endJunction
endJunction committed Jul 20, 2023
2 parents 6cac247 + 28bb616 commit bca07ca
Show file tree
Hide file tree
Showing 15 changed files with 463 additions and 40 deletions.
78 changes: 73 additions & 5 deletions Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,29 +131,97 @@
<t_end>7200</t_end>
<timesteps>
<pair>
<repeat>10</repeat>
<delta_t>1</delta_t>
<repeat>1</repeat>
<delta_t>0.06</delta_t>
</pair>
<pair>
<repeat>9</repeat>
<delta_t>1</delta_t>
</pair>
<pair>
<repeat>5</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>11</repeat>
<delta_t>100</delta_t>
<repeat>1</repeat>
<delta_t>0.94</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>30</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>80</delta_t>
</pair>
<pair>
<repeat>9</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>2</repeat>
<delta_t>200</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>400</delta_t>
</pair>
<pair>
<repeat>7</repeat>
<repeat>3</repeat>
<delta_t>600</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>200</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>600</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.06</delta_t>
</pair>
<pair>
<repeat>9</repeat>
<delta_t>1</delta_t>
</pair>
<pair>
<repeat>5</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.94</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>30</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>80</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>100</delta_t>
</pair>
</timesteps>
</time_stepping>
</process>
Expand Down
78 changes: 73 additions & 5 deletions Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,29 +151,97 @@
<t_end>7200</t_end>
<timesteps>
<pair>
<repeat>10</repeat>
<delta_t>1</delta_t>
<repeat>1</repeat>
<delta_t>0.06</delta_t>
</pair>
<pair>
<repeat>9</repeat>
<delta_t>1</delta_t>
</pair>
<pair>
<repeat>5</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>11</repeat>
<delta_t>100</delta_t>
<repeat>1</repeat>
<delta_t>0.94</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>30</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>80</delta_t>
</pair>
<pair>
<repeat>9</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>2</repeat>
<delta_t>200</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>400</delta_t>
</pair>
<pair>
<repeat>7</repeat>
<repeat>3</repeat>
<delta_t>600</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>200</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>600</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.06</delta_t>
</pair>
<pair>
<repeat>9</repeat>
<delta_t>1</delta_t>
</pair>
<pair>
<repeat>5</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.94</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>30</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>80</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>100</delta_t>
</pair>
</timesteps>
</time_stepping>
</process>
Expand Down
44 changes: 41 additions & 3 deletions Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_restart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,47 @@

<replace sel="/*/time_loop/processes/process/time_stepping/t_initial/text()">600</replace>

<remove sel="/*/time_loop/processes/process/time_stepping/timesteps/pair[1]" />
<remove sel="/*/time_loop/processes/process/time_stepping/timesteps/pair[1]" />
<replace sel="/*/time_loop/processes/process/time_stepping/timesteps/pair[1]/repeat/text()">6</replace>
<remove sel="/*/time_loop/processes/process/time_stepping/timesteps" />
<add sel="/*/time_loop/processes/process/time_stepping">
<timesteps>
<pair>
<repeat>6</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>200</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>400</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>200</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>400</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>600</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>200</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>600</delta_t>
</pair>
<pair>
<repeat>6</repeat>
<delta_t>100</delta_t>
</pair>
</timesteps>
</add>

<replace sel="/*/time_loop/output/prefix/text()">liakopoulos_restart</replace>

Expand Down
12 changes: 10 additions & 2 deletions Tests/Data/TH2M/H2M/Liakopoulos/liakopoulos_TH2M.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,23 @@
<delta_t>10</delta_t>
</pair>
<pair>
<repeat>5</repeat>
<repeat>1</repeat>
<delta_t>40</delta_t>
</pair>
<pair>
<repeat>3</repeat>
<delta_t>50</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>30</delta_t>
</pair>
<pair>
<repeat>5</repeat>
<delta_t>100</delta_t>
</pair>
<pair>
<repeat>5</repeat>
<repeat>13</repeat>
<delta_t>200</delta_t>
</pair>
</timesteps>
Expand Down
10 changes: 9 additions & 1 deletion Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,15 @@
<t_end>3</t_end>
<timesteps>
<pair>
<repeat>405</repeat>
<repeat>199</repeat>
<delta_t>7.5e-3</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>7.49999999999866773e-3</delta_t>
</pair>
<pair>
<repeat>205</repeat>
<delta_t>7.5e-3</delta_t>
</pair>
</timesteps>
Expand Down
10 changes: 9 additions & 1 deletion Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,15 @@
<t_end>20</t_end>
<timesteps>
<pair>
<repeat>405</repeat>
<repeat>199</repeat>
<delta_t>0.05</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.04999999999999289457</delta_t>
</pair>
<pair>
<repeat>200</repeat>
<delta_t>0.05</delta_t>
</pair>
</timesteps>
Expand Down
10 changes: 9 additions & 1 deletion Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@
<delta_t>1.0e-10</delta_t>
</pair>
<pair>
<repeat>105</repeat>
<repeat>4</repeat>
<delta_t>1.0e-1</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.099999999899999969522</delta_t>
</pair>
<pair>
<repeat>100</repeat>
<delta_t>1.0e-1</delta_t>
</pair>
</timesteps>
Expand Down
10 changes: 9 additions & 1 deletion Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,15 @@
<t_end>1</t_end>
<timesteps>
<pair>
<repeat>505</repeat>
<repeat>349</repeat>
<delta_t>0.002</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.00199999999999945</delta_t>
</pair>
<pair>
<repeat>150</repeat>
<delta_t>0.002</delta_t>
</pair>
</timesteps>
Expand Down
10 changes: 9 additions & 1 deletion Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@
<delta_t>1e-10</delta_t>
</pair>
<pair>
<repeat>11</repeat>
<repeat>4</repeat>
<delta_t>0.1</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.0999999999</delta_t>
</pair>
<pair>
<repeat>6</repeat>
<delta_t>0.1</delta_t>
</pair>
</timesteps>
Expand Down
10 changes: 9 additions & 1 deletion Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,15 @@
<t_end>1</t_end>
<timesteps>
<pair>
<repeat>505</repeat>
<repeat>299</repeat>
<delta_t>0.002</delta_t>
</pair>
<pair>
<repeat>1</repeat>
<delta_t>0.00199999999999956</delta_t>
</pair>
<pair>
<repeat>200</repeat>
<delta_t>0.002</delta_t>
</pair>
</timesteps>
Expand Down
Loading

0 comments on commit bca07ca

Please sign in to comment.