Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add macro for consistent sunrealtype formatting #517

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
+884 −1,676
Open

Add macro for consistent sunrealtype formatting #517

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3f3be17
Squash commits
Steven-Roberts Jun 21, 2024
39b1620
Merge branch 'develop' into feature/real-format3
gardner48 Jun 22, 2024
c32face
Merge branch 'develop' into feature/real-format3
gardner48 Jun 22, 2024
83905c8
update .out files
gardner48 Jun 24, 2024
65e9da0
Merge branch 'develop' into feature/real-format3
gardner48 Jun 27, 2024
50f32bb
Apply suggestions from code review
Steven-Roberts Jun 28, 2024
fe7f76d
Update src/sundials/sundials_utils.h
Steven-Roberts Jun 28, 2024
84024ab
Remove final newline from matrix output
Steven-Roberts Jun 29, 2024
494f217
Merge branch 'feature/real-format3' of github.com:LLNL/sundials into …
Steven-Roberts Jun 29, 2024
bdb5bbb
Switch IDA to sunfprintf_*
Steven-Roberts Jun 29, 2024
df13a2a
Switch to SUN_FORMAT_*
Steven-Roberts Jun 29, 2024
817ed11
Switch to 'e' format for MRI tables
Steven-Roberts Jun 29, 2024
a415ce9
Apply formatter
Steven-Roberts Jun 29, 2024
9b654df
Use space consistently in format
Steven-Roberts Jun 29, 2024
e9c9a71
Fix ida real stats
Steven-Roberts Jun 29, 2024
7cd0509
Switch Butcher table to 'e' format
Steven-Roberts Jun 29, 2024
9aaddfe
update output files
gardner48 Jun 30, 2024
fbd7ad0
Merge branch 'develop' into feature/real-format3
gardner48 Jul 3, 2024
77f6135
Merge branch 'develop' into feature/real-format3
Steven-Roberts Jul 27, 2024
aef939b
Remove sign padding from g format
Steven-Roberts Jul 27, 2024
50d8d8c
Merge branch 'develop' into feature/real-format3
Steven-Roberts Aug 29, 2024
9ec1fad
Merge branch 'develop' into feature/real-format3
Steven-Roberts Sep 6, 2024
e7d6397
Merge branch 'develop' into feature/real-format3
Steven-Roberts Sep 17, 2024
5399b9e
Revert out files to make future merges easier
Steven-Roberts Sep 17, 2024
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
8 changes: 4 additions & 4 deletions examples/arkode/C_serial/ark_analytic_nonlin.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ Analytical ODE test problem:
---------------------

Final Statistics:
Current time = 10.12157090914652
Current time = 10.1215709091465
Steps = 82
Step attempts = 83
Stability limited steps = 0
Accuracy limited steps = 83
Error test fails = 1
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 6.103515625000001e-12
Last step size = 0.4463519264234082
Current step size = 0.4463519264234082
Initial step size = 6.103515625e-12
Last step size = 0.446351926423408
Current step size = 0.446351926423408
RHS fn evals = 417
4 changes: 2 additions & 2 deletions examples/arkode/C_serial/ark_damped_harmonic_symplectic.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ t = 23.561945, q(t) = 1.242002, H = 1.013408
t = 27.488936, q(t) = -0.806768, H = 0.352368
t = 31.415927, q(t) = 0.878500, H = 0.773974

Current time = 31.41592653589793
Current time = 31.4159265358979
Steps = 31416
Step attempts = 31416
Stability limited steps = 0
Expand All @@ -20,7 +20,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 0.0009908169824406335
Last step size = 0.000990816982440633
Current step size = 0.001
f1 RHS fn evals = 125664
f2 RHS fn evals = 125664
4 changes: 2 additions & 2 deletions examples/arkode/C_serial/ark_harmonic_symplectic.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ t = 4.712389, x(t) = 0.000000, E = 50.000000, sol. err = 9.5373481893755732e-13
t = 5.497787, x(t) = 7.071068, E = 50.000000, sol. err = 1.6668477791399526e-12
t = 6.283185, x(t) = 10.000000, E = 50.000000, sol. err = 4.3080167445556004e-12

Current time = 6.283185307179586
Current time = 6.28318530717959
Steps = 6288
Step attempts = 6288
Stability limited steps = 0
Expand All @@ -20,7 +20,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 0.0003981633971861239
Last step size = 0.000398163397186124
Current step size = 0.001
f1 RHS fn evals = 25152
f2 RHS fn evals = 25152
2 changes: 1 addition & 1 deletion examples/arkode/C_serial/ark_kepler.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.01
Last step size = 0.009999999998981926
Last step size = 0.00999999999898193
Current step size = 0.01
f1 RHS fn evals = 40000
f2 RHS fn evals = 40000
6 changes: 3 additions & 3 deletions examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_adapt.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ Accuracy limited steps = 438
Error test fails = 67
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 1.836231979046091e-06
Last step size = 0.2400202274108805
Current step size = 0.2400202274108805
Initial step size = 1.83623197904609e-06
Last step size = 0.24002022741088
Current step size = 0.24002022741088
Explicit RHS fn evals = 2125
Implicit RHS fn evals = 0
NLS iters = 0
Expand Down
2 changes: 1 addition & 1 deletion examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_fixed_--count-orbits.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.01
Last step size = 0.009999999998981926
Last step size = 0.00999999999898193
Current step size = 0.01
Root fn evals = 10288
Explicit RHS fn evals = 50000
Expand Down
16 changes: 8 additions & 8 deletions ..._SPRK_--step-mode_fixed_--method_ARKODE_SPRK_EULER_1_1_--tf_50_--check-order_--nout_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 2.582822844487962e-11
Last step size = 2.58282284448796e-11
Current step size = 0.001
Explicit RHS fn evals = 400008
Implicit RHS fn evals = 0
Expand Down Expand Up @@ -52,7 +52,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 2.582822844487962e-11
Last step size = 2.58282284448796e-11
Current step size = 0.001
f1 RHS fn evals = 50001
f2 RHS fn evals = 50001
Expand Down Expand Up @@ -80,7 +80,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.0005
Last step size = 0.0004999999432868658
Last step size = 0.000499999943286866
Current step size = 0.0005
f1 RHS fn evals = 100000
f2 RHS fn evals = 100000
Expand Down Expand Up @@ -108,7 +108,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.00025
Last step size = 0.0002499998522722533
Last step size = 0.000249999852272253
Current step size = 0.00025
f1 RHS fn evals = 200000
f2 RHS fn evals = 200000
Expand Down Expand Up @@ -136,7 +136,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.000125
Last step size = 3.183586727573126e-10
Last step size = 3.18358672757313e-10
Current step size = 0.000125
f1 RHS fn evals = 400001
f2 RHS fn evals = 400001
Expand Down Expand Up @@ -164,7 +164,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 6.25e-05
Last step size = 7.503473398173804e-10
Last step size = 7.5034733981738e-10
Current step size = 6.25e-05
f1 RHS fn evals = 800001
f2 RHS fn evals = 800001
Expand Down Expand Up @@ -220,7 +220,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 1.5625e-05
Last step size = 1.562198162474714e-05
Last step size = 1.56219816247471e-05
Current step size = 1.5625e-05
f1 RHS fn evals = 3200000
f2 RHS fn evals = 3200000
Expand Down Expand Up @@ -248,7 +248,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 7.8125e-06
Last step size = 7.805897645596353e-06
Last step size = 7.80589764559635e-06
Current step size = 7.8125e-06
f1 RHS fn evals = 6400000
f2 RHS fn evals = 6400000
Expand Down
16 changes: 8 additions & 8 deletions ...RK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 2.582822844487962e-11
Last step size = 2.58282284448796e-11
Current step size = 0.001
Explicit RHS fn evals = 400008
Implicit RHS fn evals = 0
Expand Down Expand Up @@ -52,7 +52,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 2.582822844487962e-11
Last step size = 2.58282284448796e-11
Current step size = 0.001
f1 RHS fn evals = 100002
f2 RHS fn evals = 100002
Expand Down Expand Up @@ -80,7 +80,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.0005
Last step size = 0.0004999999432868658
Last step size = 0.000499999943286866
Current step size = 0.0005
f1 RHS fn evals = 200000
f2 RHS fn evals = 200000
Expand Down Expand Up @@ -108,7 +108,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.00025
Last step size = 0.0002499998522722533
Last step size = 0.000249999852272253
Current step size = 0.00025
f1 RHS fn evals = 400000
f2 RHS fn evals = 400000
Expand Down Expand Up @@ -136,7 +136,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.000125
Last step size = 3.183586727573126e-10
Last step size = 3.18358672757313e-10
Current step size = 0.000125
f1 RHS fn evals = 800002
f2 RHS fn evals = 800002
Expand Down Expand Up @@ -164,7 +164,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 6.25e-05
Last step size = 7.503473398173804e-10
Last step size = 7.5034733981738e-10
Current step size = 6.25e-05
f1 RHS fn evals = 1600002
f2 RHS fn evals = 1600002
Expand Down Expand Up @@ -220,7 +220,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 1.5625e-05
Last step size = 1.562198162474714e-05
Last step size = 1.56219816247471e-05
Current step size = 1.5625e-05
f1 RHS fn evals = 6400000
f2 RHS fn evals = 6400000
Expand Down Expand Up @@ -248,7 +248,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 7.8125e-06
Last step size = 7.805897645596353e-06
Last step size = 7.80589764559635e-06
Current step size = 7.8125e-06
f1 RHS fn evals = 12800000
f2 RHS fn evals = 12800000
Expand Down
16 changes: 8 additions & 8 deletions ...K_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_2_2_--tf_50_--check-order_--nout_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 2.582822844487962e-11
Last step size = 2.58282284448796e-11
Current step size = 0.001
Explicit RHS fn evals = 400008
Implicit RHS fn evals = 0
Expand Down Expand Up @@ -52,7 +52,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 2.582822844487962e-11
Last step size = 2.58282284448796e-11
Current step size = 0.001
f1 RHS fn evals = 100002
f2 RHS fn evals = 100002
Expand Down Expand Up @@ -80,7 +80,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.0005
Last step size = 0.0004999999432868658
Last step size = 0.000499999943286866
Current step size = 0.0005
f1 RHS fn evals = 200000
f2 RHS fn evals = 200000
Expand Down Expand Up @@ -108,7 +108,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.00025
Last step size = 0.0002499998522722533
Last step size = 0.000249999852272253
Current step size = 0.00025
f1 RHS fn evals = 400000
f2 RHS fn evals = 400000
Expand Down Expand Up @@ -136,7 +136,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.000125
Last step size = 3.183586727573126e-10
Last step size = 3.18358672757313e-10
Current step size = 0.000125
f1 RHS fn evals = 800002
f2 RHS fn evals = 800002
Expand Down Expand Up @@ -164,7 +164,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 6.25e-05
Last step size = 7.503473398173804e-10
Last step size = 7.5034733981738e-10
Current step size = 6.25e-05
f1 RHS fn evals = 1600002
f2 RHS fn evals = 1600002
Expand Down Expand Up @@ -220,7 +220,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 1.5625e-05
Last step size = 1.562198162474714e-05
Last step size = 1.56219816247471e-05
Current step size = 1.5625e-05
f1 RHS fn evals = 6400000
f2 RHS fn evals = 6400000
Expand Down Expand Up @@ -248,7 +248,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 7.8125e-06
Last step size = 7.805897645596353e-06
Last step size = 7.80589764559635e-06
Current step size = 7.8125e-06
f1 RHS fn evals = 12800000
f2 RHS fn evals = 12800000
Expand Down
14 changes: 7 additions & 7 deletions ...K_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_3_3_--tf_50_--check-order_--nout_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.001
Last step size = 2.582822844487962e-11
Last step size = 2.58282284448796e-11
Current step size = 0.001
Explicit RHS fn evals = 400008
Implicit RHS fn evals = 0
Expand Down Expand Up @@ -108,7 +108,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.025
Last step size = 1.769251412042648e-12
Last step size = 1.76925141204265e-12
Current step size = 0.025
f1 RHS fn evals = 6003
f2 RHS fn evals = 6003
Expand Down Expand Up @@ -136,7 +136,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.0125
Last step size = 0.01249999999719619
Last step size = 0.0124999999971962
Current step size = 0.0125
f1 RHS fn evals = 12000
f2 RHS fn evals = 12000
Expand Down Expand Up @@ -164,7 +164,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.00625
Last step size = 0.006249999992917305
Last step size = 0.0062499999929173
Current step size = 0.00625
f1 RHS fn evals = 24000
f2 RHS fn evals = 24000
Expand Down Expand Up @@ -192,7 +192,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.003125
Last step size = 1.124078607972478e-11
Last step size = 1.12407860797248e-11
Current step size = 0.003125
f1 RHS fn evals = 48003
f2 RHS fn evals = 48003
Expand Down Expand Up @@ -220,7 +220,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.0015625
Last step size = 2.835776058418557e-11
Last step size = 2.83577605841856e-11
Current step size = 0.0015625
f1 RHS fn evals = 96003
f2 RHS fn evals = 96003
Expand Down Expand Up @@ -248,7 +248,7 @@ Error test fails = 0
NLS step fails = 0
Inequality constraint fails = 0
Initial step size = 0.00078125
Last step size = 0.0007812499550681189
Last step size = 0.000781249955068119
Current step size = 0.00078125
f1 RHS fn evals = 192000
f2 RHS fn evals = 192000
Expand Down
Loading
Loading