1 --- ./source/standard.c.~1~ 2009-08-16 21:35:21.000000000 +0200
2 +++ ./source/standard.c 2010-07-22 05:14:45.000000000 +0200
4 A68_ENV_REAL (genie_cgs_astronomical_unit, GSL_CONST_CGS_ASTRONOMICAL_UNIT)
5 A68_ENV_REAL (genie_cgs_bar, GSL_CONST_CGS_BAR)
6 A68_ENV_REAL (genie_cgs_barn, GSL_CONST_CGS_BARN)
7 +#ifdef GSL_CONST_CGS_BOHR_MAGNETON
8 A68_ENV_REAL (genie_cgs_bohr_magneton, GSL_CONST_CGS_BOHR_MAGNETON)
10 A68_ENV_REAL (genie_cgs_bohr_radius, GSL_CONST_CGS_BOHR_RADIUS)
11 A68_ENV_REAL (genie_cgs_boltzmann, GSL_CONST_CGS_BOLTZMANN)
12 A68_ENV_REAL (genie_cgs_btu, GSL_CONST_CGS_BTU)
13 @@ -3153,13 +3155,23 @@
14 A68_ENV_REAL (genie_cgs_curie, GSL_CONST_CGS_CURIE)
15 A68_ENV_REAL (genie_cgs_day, GSL_CONST_CGS_DAY)
16 A68_ENV_REAL (genie_cgs_dyne, GSL_CONST_CGS_DYNE)
17 +#ifdef GSL_CONST_CGS_ELECTRON_CHARGE
18 A68_ENV_REAL (genie_cgs_electron_charge, GSL_CONST_CGS_ELECTRON_CHARGE)
20 +#ifdef GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT
21 A68_ENV_REAL (genie_cgs_electron_magnetic_moment, GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT)
23 A68_ENV_REAL (genie_cgs_electron_volt, GSL_CONST_CGS_ELECTRON_VOLT) A68_ENV_REAL (genie_cgs_erg, GSL_CONST_CGS_ERG)
24 -A68_ENV_REAL (genie_cgs_faraday, GSL_CONST_CGS_FARADAY) A68_ENV_REAL (genie_cgs_fathom, GSL_CONST_CGS_FATHOM)
25 +#ifdef GSL_CONST_CGS_FARADAY
26 +A68_ENV_REAL (genie_cgs_faraday, GSL_CONST_CGS_FARADAY)
28 +A68_ENV_REAL (genie_cgs_fathom, GSL_CONST_CGS_FATHOM)
29 A68_ENV_REAL (genie_cgs_fluid_ounce, GSL_CONST_CGS_FLUID_OUNCE) A68_ENV_REAL (genie_cgs_foot, GSL_CONST_CGS_FOOT)
30 A68_ENV_REAL (genie_cgs_footcandle, GSL_CONST_CGS_FOOTCANDLE) A68_ENV_REAL (genie_cgs_footlambert, GSL_CONST_CGS_FOOTLAMBERT)
31 -A68_ENV_REAL (genie_cgs_gauss, GSL_CONST_CGS_GAUSS) A68_ENV_REAL (genie_cgs_gram_force, GSL_CONST_CGS_GRAM_FORCE)
32 +#ifdef GSL_CONST_CGS_GAUSS
33 +A68_ENV_REAL (genie_cgs_gauss, GSL_CONST_CGS_GAUSS)
35 +A68_ENV_REAL (genie_cgs_gram_force, GSL_CONST_CGS_GRAM_FORCE)
36 A68_ENV_REAL (genie_cgs_grav_accel, GSL_CONST_CGS_GRAV_ACCEL)
37 A68_ENV_REAL (genie_cgs_gravitational_constant, GSL_CONST_CGS_GRAVITATIONAL_CONSTANT)
38 A68_ENV_REAL (genie_cgs_hectare, GSL_CONST_CGS_HECTARE) A68_ENV_REAL (genie_cgs_horsepower, GSL_CONST_CGS_HORSEPOWER)
39 @@ -3178,14 +3190,19 @@
40 A68_ENV_REAL (genie_cgs_mil, GSL_CONST_CGS_MIL) A68_ENV_REAL (genie_cgs_mile, GSL_CONST_CGS_MILE)
41 A68_ENV_REAL (genie_cgs_miles_per_hour, GSL_CONST_CGS_MILES_PER_HOUR) A68_ENV_REAL (genie_cgs_minute, GSL_CONST_CGS_MINUTE)
42 A68_ENV_REAL (genie_cgs_molar_gas, GSL_CONST_CGS_MOLAR_GAS) A68_ENV_REAL (genie_cgs_nautical_mile, GSL_CONST_CGS_NAUTICAL_MILE)
43 -A68_ENV_REAL (genie_cgs_newton, GSL_CONST_CGS_NEWTON) A68_ENV_REAL (genie_cgs_nuclear_magneton, GSL_CONST_CGS_NUCLEAR_MAGNETON)
44 +A68_ENV_REAL (genie_cgs_newton, GSL_CONST_CGS_NEWTON)
45 +#ifdef GSL_CONST_CGS_NUCLEAR_MAGNETON
46 +A68_ENV_REAL (genie_cgs_nuclear_magneton, GSL_CONST_CGS_NUCLEAR_MAGNETON)
48 A68_ENV_REAL (genie_cgs_ounce_mass, GSL_CONST_CGS_OUNCE_MASS) A68_ENV_REAL (genie_cgs_parsec, GSL_CONST_CGS_PARSEC)
49 A68_ENV_REAL (genie_cgs_phot, GSL_CONST_CGS_PHOT) A68_ENV_REAL (genie_cgs_pint, GSL_CONST_CGS_PINT)
50 A68_ENV_REAL (genie_cgs_planck_constant_h, 6.6260693e-27) A68_ENV_REAL (genie_cgs_planck_constant_hbar, 6.6260693e-27 / (2 * A68G_PI))
51 A68_ENV_REAL (genie_cgs_point, GSL_CONST_CGS_POINT) A68_ENV_REAL (genie_cgs_poise, GSL_CONST_CGS_POISE)
52 A68_ENV_REAL (genie_cgs_pound_force, GSL_CONST_CGS_POUND_FORCE) A68_ENV_REAL (genie_cgs_pound_mass, GSL_CONST_CGS_POUND_MASS)
53 A68_ENV_REAL (genie_cgs_poundal, GSL_CONST_CGS_POUNDAL)
54 +#ifdef GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT
55 A68_ENV_REAL (genie_cgs_proton_magnetic_moment, GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT)
57 A68_ENV_REAL (genie_cgs_psi, GSL_CONST_CGS_PSI) A68_ENV_REAL (genie_cgs_quart, GSL_CONST_CGS_QUART)
58 A68_ENV_REAL (genie_cgs_rad, GSL_CONST_CGS_RAD) A68_ENV_REAL (genie_cgs_roentgen, GSL_CONST_CGS_ROENTGEN)
59 A68_ENV_REAL (genie_cgs_rydberg, GSL_CONST_CGS_RYDBERG) A68_ENV_REAL (genie_cgs_solar_mass, GSL_CONST_CGS_SOLAR_MASS)
60 --- ./source/prelude.c.~1~ 2009-08-16 21:35:21.000000000 +0200
61 +++ ./source/prelude.c 2010-07-22 05:25:23.000000000 +0200
62 @@ -1829,10 +1829,10 @@
63 a68_idf (A68_EXT, "cgsmassneutron", MODE (REAL), genie_cgs_mass_neutron);
64 a68_idf (A68_EXT, "cgsrydberg", MODE (REAL), genie_cgs_rydberg);
65 a68_idf (A68_EXT, "cgsboltzmann", MODE (REAL), genie_cgs_boltzmann);
66 - a68_idf (A68_EXT, "cgsbohrmagneton", MODE (REAL), genie_cgs_bohr_magneton);
67 - a68_idf (A68_EXT, "cgsnuclearmagneton", MODE (REAL), genie_cgs_nuclear_magneton);
68 - a68_idf (A68_EXT, "cgselectronmagneticmoment", MODE (REAL), genie_cgs_electron_magnetic_moment);
69 - a68_idf (A68_EXT, "cgsprotonmagneticmoment", MODE (REAL), genie_cgs_proton_magnetic_moment);
70 +// a68_idf (A68_EXT, "cgsbohrmagneton", MODE (REAL), genie_cgs_bohr_magneton);
71 +// a68_idf (A68_EXT, "cgsnuclearmagneton", MODE (REAL), genie_cgs_nuclear_magneton);
72 +// a68_idf (A68_EXT, "cgselectronmagneticmoment", MODE (REAL), genie_cgs_electron_magnetic_moment);
73 +// a68_idf (A68_EXT, "cgsprotonmagneticmoment", MODE (REAL), genie_cgs_proton_magnetic_moment);
74 a68_idf (A68_EXT, "cgsmolargas", MODE (REAL), genie_cgs_molar_gas);
75 a68_idf (A68_EXT, "cgsstandardgasvolume", MODE (REAL), genie_cgs_standard_gas_volume);
76 a68_idf (A68_EXT, "cgsminute", MODE (REAL), genie_cgs_minute);
78 a68_idf (A68_EXT, "cgspsi", MODE (REAL), genie_cgs_psi);
79 a68_idf (A68_EXT, "cgspoise", MODE (REAL), genie_cgs_poise);
80 a68_idf (A68_EXT, "cgsstokes", MODE (REAL), genie_cgs_stokes);
81 - a68_idf (A68_EXT, "cgsfaraday", MODE (REAL), genie_cgs_faraday);
82 - a68_idf (A68_EXT, "cgselectroncharge", MODE (REAL), genie_cgs_electron_charge);
83 - a68_idf (A68_EXT, "cgsgauss", MODE (REAL), genie_cgs_gauss);
84 +// a68_idf (A68_EXT, "cgsfaraday", MODE (REAL), genie_cgs_faraday);
85 +// a68_idf (A68_EXT, "cgselectroncharge", MODE (REAL), genie_cgs_electron_charge);
86 +// a68_idf (A68_EXT, "cgsgauss", MODE (REAL), genie_cgs_gauss);
87 a68_idf (A68_EXT, "cgsstilb", MODE (REAL), genie_cgs_stilb);
88 a68_idf (A68_EXT, "cgslumen", MODE (REAL), genie_cgs_lumen);
89 a68_idf (A68_EXT, "cgslux", MODE (REAL), genie_cgs_lux);