mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 08:38:23 +01:00
Fixed bugs with zero.sed.
Output should now be in standard form. git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1398 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst
parent
753bbfc50e
commit
6b0ccbcc51
28
Makefile
28
Makefile
@ -102,24 +102,10 @@ revert:
|
||||
svn st | egrep ^! | cut -b 2- | xargs svn revert
|
||||
|
||||
zero:
|
||||
./zero.sed ex1.out
|
||||
./zero.sed ex2.out
|
||||
./zero.sed ex3.out
|
||||
./zero.sed ex4.out
|
||||
./zero.sed ex5.out
|
||||
./zero.sed ex6.out
|
||||
./zero.sed ex7.out
|
||||
./zero.sed ex8.out
|
||||
./zero.sed ex9.out
|
||||
./zero.sed ex10.out
|
||||
./zero.sed ex11.out
|
||||
./zero.sed ex12.out
|
||||
./zero.sed ex12a.out
|
||||
./zero.sed ex13a.out
|
||||
./zero.sed ex13b.out
|
||||
./zero.sed ex13c.out
|
||||
./zero.sed ex14.out
|
||||
./zero.sed ex15.out
|
||||
./zero.sed ex16.out
|
||||
./zero.sed ex17.out
|
||||
./zero.sed ex18.out
|
||||
for FILE in *.out *.sel; \
|
||||
do \
|
||||
if [ $$FILE != make.out ]; then \
|
||||
echo $$FILE; \
|
||||
./zero.sed $$FILE; \
|
||||
fi \
|
||||
done;
|
||||
|
||||
26
ex2.sel
26
ex2.sel
@ -4,33 +4,33 @@
|
||||
1 react 1 -99 0 2 7.05329 10.6168 26.000 -0.2157 0.0000
|
||||
1 react 1 -99 0 3 7.03993 10.5483 27.000 -0.2115 0.0000
|
||||
1 react 1 -99 0 4 7.02667 10.4802 28.000 -0.2071 0.0000
|
||||
1 react 1 -99 0 5 7.01353 10.4112 29.000 -0.2025 -0.0000
|
||||
1 react 1 -99 0 6 7.00051 10.3448 30.000 -0.1977 -0.0000
|
||||
1 react 1 -99 0 7 6.9876 10.2781 31.000 -0.1928 -0.0000
|
||||
1 react 1 -99 0 5 7.01353 10.4112 29.000 -0.2025 0.0000
|
||||
1 react 1 -99 0 6 7.00051 10.3448 30.000 -0.1977 0.0000
|
||||
1 react 1 -99 0 7 6.9876 10.2781 31.000 -0.1928 0.0000
|
||||
1 react 1 -99 0 8 6.97482 10.214 32.000 -0.1877 0.0000
|
||||
1 react 1 -99 0 9 6.96217 10.1439 33.000 -0.1824 0.0000
|
||||
1 react 1 -99 0 10 6.94965 10.0781 34.000 -0.1769 0.0000
|
||||
1 react 1 -99 0 11 6.93726 10.0148 35.000 -0.1713 0.0000
|
||||
1 react 1 -99 0 12 6.925 9.94582 36.000 -0.1655 -0.0000
|
||||
1 react 1 -99 0 12 6.925 9.94582 36.000 -0.1655 0.0000
|
||||
1 react 1 -99 0 13 6.91288 9.88343 37.000 -0.1595 0.0000
|
||||
1 react 1 -99 0 14 6.90089 9.81977 38.000 -0.1533 -0.0000
|
||||
1 react 1 -99 0 15 6.88905 9.76993 39.000 -0.1470 -0.0000
|
||||
1 react 1 -99 0 14 6.90089 9.81977 38.000 -0.1533 0.0000
|
||||
1 react 1 -99 0 15 6.88905 9.76993 39.000 -0.1470 0.0000
|
||||
1 react 1 -99 0 16 6.87734 9.69695 40.000 -0.1406 0.0000
|
||||
1 react 1 -99 0 17 6.86578 9.62778 41.000 -0.1340 -0.0000
|
||||
1 react 1 -99 0 17 6.86578 9.62778 41.000 -0.1340 0.0000
|
||||
1 react 1 -99 0 18 6.85435 9.56528 42.000 -0.1272 0.0000
|
||||
1 react 1 -99 0 19 6.84307 9.50207 43.000 -0.1203 0.0000
|
||||
1 react 1 -99 0 20 6.83193 9.44044 44.000 -0.1132 0.0000
|
||||
1 react 1 -99 0 21 6.82093 9.37893 45.000 -0.1060 -0.0000
|
||||
1 react 1 -99 0 21 6.82093 9.37893 45.000 -0.1060 0.0000
|
||||
1 react 1 -99 0 22 6.81008 9.31719 46.000 -0.0986 0.0000
|
||||
1 react 1 -99 0 23 6.79936 9.25516 47.000 -0.0911 -0.0000
|
||||
1 react 1 -99 0 23 6.79936 9.25516 47.000 -0.0911 0.0000
|
||||
1 react 1 -99 0 24 6.78879 9.2401 48.000 -0.0835 0.0000
|
||||
1 react 1 -99 0 25 6.77836 9.13288 49.000 -0.0757 0.0000
|
||||
1 react 1 -99 0 26 6.76807 9.07133 50.000 -0.0678 -0.0000
|
||||
1 react 1 -99 0 27 6.75793 9.0134 51.000 -0.0597 -0.0000
|
||||
1 react 1 -99 0 28 6.74792 8.95192 52.000 -0.0515 -0.0000
|
||||
1 react 1 -99 0 26 6.76807 9.07133 50.000 -0.0678 0.0000
|
||||
1 react 1 -99 0 27 6.75793 9.0134 51.000 -0.0597 0.0000
|
||||
1 react 1 -99 0 28 6.74792 8.95192 52.000 -0.0515 0.0000
|
||||
1 react 1 -99 0 29 6.73806 8.80187 53.000 -0.0432 0.0000
|
||||
1 react 1 -99 0 30 6.72833 8.83196 54.000 -0.0347 0.0000
|
||||
1 react 1 -99 0 31 6.71874 8.77434 55.000 -0.0261 -0.0000
|
||||
1 react 1 -99 0 31 6.71874 8.77434 55.000 -0.0261 0.0000
|
||||
1 react 1 -99 0 32 6.7093 8.71389 56.000 -0.0174 0.0000
|
||||
1 react 1 -99 0 33 6.69999 8.65611 57.000 -0.0085 0.0000
|
||||
1 react 1 -99 0 34 6.69076 8.59051 58.000 0.0000 -0.0004
|
||||
|
||||
2
ex5.sel
2
ex5.sel
@ -4,4 +4,4 @@
|
||||
1 react 1 -99 0 2 8.17103 -4.28707 5.0000e-04 9.9997e+00 -2.6667e-04 1.0000e+01 2.6666e-04 9.9991e+00 -9.2766e-04 1.0000e+01 1.4180e-04 0.0000e+00 0.0000e+00 -2.0202
|
||||
1 react 1 -99 0 3 7.98207 -3.97043 2.5000e-03 9.9987e+00 -1.3333e-03 1.0001e+01 1.3333e-03 9.9971e+00 -2.9374e-03 1.0002e+01 2.3951e-03 0.0000e+00 0.0000e+00 -1.0629
|
||||
1 react 1 -99 0 4 7.88418 -3.81741 5.0001e-03 9.9973e+00 -2.6667e-03 1.0003e+01 2.6666e-03 9.9944e+00 -5.5594e-03 1.0005e+01 5.1054e-03 0.0000e+00 0.0000e+00 -0.6499
|
||||
1 react 1 -99 0 5 7.71922 -3.56545 2.5011e-02 9.9867e+00 -1.3333e-02 1.0013e+01 1.3333e-02 9.9732e+00 -2.6841e-02 1.0026e+01 2.6489e-02 9.0018e-03 9.0018e-03 -0.0000
|
||||
1 react 1 -99 0 5 7.71922 -3.56545 2.5011e-02 9.9867e+00 -1.3333e-02 1.0013e+01 1.3333e-02 9.9732e+00 -2.6841e-02 1.0026e+01 2.6489e-02 9.0018e-03 9.0018e-03 0.0000
|
||||
|
||||
22
ex6A-B.sel
22
ex6A-B.sel
@ -2,21 +2,21 @@
|
||||
1 i_soln 1 -99 -99 -99 6.99977 4 -1.0000e+03 -6.9998e+00 -1.0000e+03 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -999.9990 -999.9990 -999.9990 -999.9990
|
||||
2 react 1 -99 0 1 7.00609 10.3913 -7.5735e+00 -7.0061e+00 -7.0969e+00 1.0000e+01 -2.6709e-08 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -3.8037 -10.6810 -14.6840
|
||||
3 react 1 -99 0 1 8.2125 9.18486 -5.6625e+00 -8.2125e+00 -5.1950e+00 1.7820e-06 1.7820e-06 1.0000e+01 -2.1788e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 0.0000 -1.8580 -5.8610
|
||||
4 react 1 -99 0 1 9.10891 8.28843 -4.7009e+00 -9.1089e+00 -4.4670e+00 0.0000e+00 0.0000e+00 9.7149e-06 9.7149e-06 1.0000e+01 -2.0015e-05 0.0000e+00 0.0000e+00 -0.7280 -0.0000 -0.0000 -2.5471
|
||||
5 react 1 -99 0 1 9.3893 8.00825 -3.9009e+00 -9.3893e+00 -3.5536e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 6.3607e-05 6.3607e-05 9.9998e+00 -1.9088e-04 -2.0015 -0.7202 -0.0000 -0.0000
|
||||
6 react 1 -99 0 1 8.35402 9.04332 -5.5204e+00 -8.3540e+00 -5.1950e+00 1.0000e+01 -3.0232e-06 1.0000e+00 1.2370e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -0.0000 -1.5744 -5.5774
|
||||
7 react 1 -99 0 1 9.06998 -3.25853 -4.6620e+00 -9.0700e+00 -4.2522e+00 0.0000e+00 0.0000e+00 1.0000e+01 -3.2683e-05 1.0000e+00 1.0785e-05 0.0000e+00 0.0000e+00 -0.9428 -0.0000 -0.0000 -2.1175
|
||||
4 react 1 -99 0 1 9.10891 8.28843 -4.7009e+00 -9.1089e+00 -4.4670e+00 0.0000e+00 0.0000e+00 9.7149e-06 9.7149e-06 1.0000e+01 -2.0015e-05 0.0000e+00 0.0000e+00 -0.7280 0.0000 0.0000 -2.5471
|
||||
5 react 1 -99 0 1 9.3893 8.00825 -3.9009e+00 -9.3893e+00 -3.5536e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 6.3607e-05 6.3607e-05 9.9998e+00 -1.9088e-04 -2.0015 -0.7202 0.0000 0.0000
|
||||
6 react 1 -99 0 1 8.35402 9.04332 -5.5204e+00 -8.3540e+00 -5.1950e+00 1.0000e+01 -3.0232e-06 1.0000e+00 1.2370e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 0.0000 -1.5744 -5.5774
|
||||
7 react 1 -99 0 1 9.06998 -3.25853 -4.6620e+00 -9.0700e+00 -4.2522e+00 0.0000e+00 0.0000e+00 1.0000e+01 -3.2683e-05 1.0000e+00 1.0785e-05 0.0000e+00 0.0000e+00 -0.9428 0.0000 0.0000 -2.1175
|
||||
8 react 1 -99 0 1 7.03143 -1.25583 -7.3981e+00 -7.0314e+00 -6.9215e+00 1.1865e-08 1.1865e-08 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -3.4530 -9.9542 -13.9572
|
||||
8 react 1 -99 0 2 7.10578 11.4644 -7.0971e+00 -7.1058e+00 -6.6206e+00 4.7135e-08 4.7135e-08 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -2.8512 -8.6762 -12.6792
|
||||
8 react 1 -99 0 3 7.24112 -1.23087 -6.7961e+00 -7.2411e+00 -6.3199e+00 1.1602e-07 1.1602e-07 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000 -2.2497 -7.3376 -11.3406
|
||||
8 react 1 -99 0 3 7.24112 -1.23087 -6.7961e+00 -7.2411e+00 -6.3199e+00 1.1602e-07 1.1602e-07 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -2.2497 -7.3376 -11.3406
|
||||
8 react 1 -99 0 4 7.45138 -1.59139 -6.4952e+00 -7.4514e+00 -6.0195e+00 2.4993e-07 2.4993e-07 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -1.6491 -5.9254 -9.9284
|
||||
8 react 1 -99 0 5 7.71458 -2.00498 -6.1942e+00 -7.7146e+00 -5.7200e+00 5.1299e-07 5.1299e-07 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -1.0500 -4.4627 -8.4657
|
||||
8 react 1 -99 0 6 7.89551 9.81121 -6.0005e+00 -7.8955e+00 -5.5279e+00 8.0811e-07 8.0811e-07 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -0.6658 -3.5117 -7.5147
|
||||
8 react 1 -99 0 7 8.17803 9.60406 -5.6997e+00 -8.1780e+00 -5.2314e+00 1.6334e-06 1.6334e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000 -0.0728 -2.0389 -6.0419
|
||||
8 react 1 -99 0 8 8.48402 -2.76934 -5.3990e+00 -8.4840e+00 -5.0858e+00 0.0000e+00 0.0000e+00 1.7119e-06 1.7119e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.1092 -0.0000 -1.3229 -5.1076
|
||||
8 react 1 -99 0 9 8.77878 8.98547 -5.0983e+00 -8.7788e+00 -4.8166e+00 0.0000e+00 0.0000e+00 3.6945e-06 3.6945e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.3784 -0.0000 -0.7276 -3.9737
|
||||
8 react 1 -99 0 10 9.0347 -3.37711 -4.7979e+00 -9.0347e+00 -4.5514e+00 0.0000e+00 0.0000e+00 7.7006e-06 7.7006e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.6436 -0.0000 -0.1712 -2.8871
|
||||
8 react 1 -99 0 11 9.07198 8.47417 -4.6640e+00 -9.0720e+00 -4.2616e+00 0.0000e+00 0.0000e+00 5.2701e-07 5.2701e-07 1.0204e-05 1.0204e-05 0.0000e+00 0.0000e+00 -0.9334 -0.0000 -0.0000 -2.1362
|
||||
8 react 1 -99 0 7 8.17803 9.60406 -5.6997e+00 -8.1780e+00 -5.2314e+00 1.6334e-06 1.6334e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000 -0.0728 -2.0389 -6.0419
|
||||
8 react 1 -99 0 8 8.48402 -2.76934 -5.3990e+00 -8.4840e+00 -5.0858e+00 0.0000e+00 0.0000e+00 1.7119e-06 1.7119e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.1092 0.0000 -1.3229 -5.1076
|
||||
8 react 1 -99 0 9 8.77878 8.98547 -5.0983e+00 -8.7788e+00 -4.8166e+00 0.0000e+00 0.0000e+00 3.6945e-06 3.6945e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.3784 0.0000 -0.7276 -3.9737
|
||||
8 react 1 -99 0 10 9.0347 -3.37711 -4.7979e+00 -9.0347e+00 -4.5514e+00 0.0000e+00 0.0000e+00 7.7006e-06 7.7006e-06 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.6436 0.0000 -0.1712 -2.8871
|
||||
8 react 1 -99 0 11 9.07198 8.47417 -4.6640e+00 -9.0720e+00 -4.2616e+00 0.0000e+00 0.0000e+00 5.2701e-07 5.2701e-07 1.0204e-05 1.0204e-05 0.0000e+00 0.0000e+00 -0.9334 0.0000 0.0000 -2.1362
|
||||
8 react 1 -99 0 12 9.2252 8.39651 -4.3726e+00 -9.2252e+00 -3.9889e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 2.1273e-05 2.1273e-05 0.0000e+00 0.0000e+00 -1.3543 -0.2964 0.0000 -1.2945
|
||||
8 react 1 -99 0 13 9.30457 -3.51497 -4.1800e+00 -9.3046e+00 -3.8127e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 3.3294e-05 3.3294e-05 0.0000e+00 0.0000e+00 -1.6212 -0.4777 0.0000 -0.7607
|
||||
8 react 1 -99 0 14 9.3893 8.9592 -3.9009e+00 -9.3893e+00 -3.5536e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 6.3607e-05 6.3607e-05 9.1200e-06 9.1200e-06 -2.0015 -0.7202 -0.0000 -0.0000
|
||||
8 react 1 -99 0 14 9.3893 8.9592 -3.9009e+00 -9.3893e+00 -3.5536e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 6.3607e-05 6.3607e-05 9.1200e-06 9.1200e-06 -2.0015 -0.7202 0.0000 0.0000
|
||||
|
||||
11
zero.sed
11
zero.sed
@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
sed "s~ \-0\.00 ~ 0\.00 ~g" < $1 | sed "s~ \-0\.000 ~ 0\.000 ~g" | sed "s~ \-0\.0000 ~ 0\.0000 ~g" | \
|
||||
sed "s~ \-0\.00 ~ 0\.00 ~g" | sed "s~ \-0\.000 ~ 0\.000 ~g" | sed "s~ \-0\.0000 ~ 0\.0000 ~g" | \
|
||||
sed "s~ \-0\.00$~ 0\.00~" | sed "s~ \-0\.000$~ 0\.000~" | sed "s~ \-0\.0000$~ 0\.0000~" | \
|
||||
sed "s~e\-00~e\+00~g" > t
|
||||
mv t $1
|
||||
#sed "s/ \-0\.00 / 0\.00 /g" < $1 | sed "s/ \-0\.000 / 0\.000 /g" | sed "s/ \-0\.0000 / 0\.0000 /g" | \
|
||||
# sed "s/ \-0\.00 / 0\.00 /g" | sed "s/ \-0\.000 / 0\.000 /g" | sed "s/ \-0\.0000 / 0\.0000 /g" | \
|
||||
# sed "s/ \-0\.00$/ 0\.00/" | sed "s/ \-0\.000$/ 0\.000/" | sed "s/ \-0\.0000$/ 0\.0000/" | \
|
||||
# sed "s/e\-00/e\+00/g" > t
|
||||
sed -e "s/e\([-+]\)0\([0-9][0-9]\)/e\1\2/g" -e "s/e\-00/e\+00/g" -e "s/-\(0\.0*[ \t\n$]\)/ \1/g" -e "s/-\(0\.0*$\)/ \1/g" $1 > tyyy$1
|
||||
mv tyyy$1 $1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user