[cig-commits] commit: Fix compile errors on cygwin
Mercurial
hg at geodynamics.org
Fri Nov 25 16:04:30 PST 2011
changeset: 921:a2dae102598d
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Fri Nov 25 16:04:18 2011 -0800
files: SysTest/AnalyticPlugins/Velic_solI/Analytic_solI.h SysTest/AnalyticPlugins/Velic_solI/solI.cxx SysTest/AnalyticPlugins/Velic_solIA/Analytic_solIA.h SysTest/AnalyticPlugins/Velic_solIA/solIA.cxx SysTest/AnalyticPlugins/Velic_solKx/Analytic_solKx.h SysTest/AnalyticPlugins/Velic_solKx/solKx.cxx SysTest/AnalyticPlugins/Velic_solKz/Analytic_solKz.h SysTest/AnalyticPlugins/Velic_solKz/solKz.cxx
description:
Fix compile errors on cygwin
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solI/Analytic_solI.h
--- a/SysTest/AnalyticPlugins/Velic_solI/Analytic_solI.h Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solI/Analytic_solI.h Fri Nov 25 16:04:18 2011 -0800
@@ -29,7 +29,7 @@
void _Velic_solI(
const double pos[],
double _sigma, /* density */
- double _B, double _x_c, /* viscosity parameter, width of dense column */
+ double BB, double _x_c, /* viscosity parameter, width of dense column */
double vel[], double* presssure,
double total_stress[], double strain_rate[] );
#endif
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solI/solI.cxx
--- a/SysTest/AnalyticPlugins/Velic_solI/solI.cxx Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solI/solI.cxx Fri Nov 25 16:04:18 2011 -0800
@@ -6,7 +6,7 @@ void _Velic_solI(
void _Velic_solI(
const double pos[],
double _sigma,
- double _B, double _x_c,
+ double BB, double _x_c,
double vel[], double* presssure,
double total_stress[], double strain_rate[] );
@@ -46,7 +46,7 @@ void _Velic_solI(
void _Velic_solI(
const double pos[],
double _sigma, /* density */
- double _B, double _x_c, /* viscosity parameter, width of dense column */
+ double BB, double _x_c, /* viscosity parameter, width of dense column */
double vel[], double* presssure,
double total_stress[], double strain_rate[] )
{
@@ -80,7 +80,7 @@ void _Velic_solI(
/* "background" fluid has density of zero */
xc = _x_c; /* centre of dense column */
sigma = _sigma; /* density parameter */
- B = _B; /* viscosity parameter */
+ B = BB; /* viscosity parameter */
/* viscosity = exp(2.0*B*z) */
/*************************************************************************/
/*************************************************************************/
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solIA/Analytic_solIA.h
--- a/SysTest/AnalyticPlugins/Velic_solIA/Analytic_solIA.h Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solIA/Analytic_solIA.h Fri Nov 25 16:04:18 2011 -0800
@@ -28,7 +28,7 @@
void _Velic_solIA(
const double pos[],
- double _sigma, double _B, /* density, viscosity parameter */
+ double _sigma, double BB, /* density, viscosity parameter */
double _dx, double _x_0, /* width of dense column, centre of dense column */
double vel[], double* presssure,
double total_stress[], double strain_rate[] );
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solIA/solIA.cxx
--- a/SysTest/AnalyticPlugins/Velic_solIA/solIA.cxx Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solIA/solIA.cxx Fri Nov 25 16:04:18 2011 -0800
@@ -5,7 +5,7 @@
void _Velic_solIA(
const double pos[],
- double _sigma, double _B,
+ double _sigma, double BB,
double _dx, double _x_0,
double vel[], double* presssure,
double total_stress[], double strain_rate[] );
@@ -44,7 +44,7 @@ int main( int argc, char **argv )
void _Velic_solIA(
const double pos[],
- double _sigma, double _B, /* density, viscosity parameter */
+ double _sigma, double BB, /* density, viscosity parameter */
double _dx, double _x_0, /* width of dense column, centre of dense column */
double vel[], double* presssure,
double total_stress[], double strain_rate[] )
@@ -80,7 +80,7 @@ void _Velic_solIA(
x0 = _x_0; /* centre of dense column */
dx = _dx; /* total width of dense column */
sigma = _sigma; /* density parameter */
- B = _B; /* viscosity parameter */
+ B = BB; /* viscosity parameter */
/* viscosity = exp(2.0*B*z) */
/*************************************************************************/
/*************************************************************************/
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solKx/Analytic_solKx.h
--- a/SysTest/AnalyticPlugins/Velic_solKx/Analytic_solKx.h Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solKx/Analytic_solKx.h Fri Nov 25 16:04:18 2011 -0800
@@ -25,7 +25,7 @@
const double pos[],
double _sigma, /* density */
double _m, int _n, /* wavelength in z, wavenumber in x */
- double _B, /* viscosity parameter */
+ double BB, /* viscosity parameter */
double vel[], double* presssure,
double total_stress[], double strain_rate[], double* viscosity );
#endif
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solKx/solKx.cxx
--- a/SysTest/AnalyticPlugins/Velic_solKx/solKx.cxx Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solKx/solKx.cxx Fri Nov 25 16:04:18 2011 -0800
@@ -7,7 +7,7 @@ void _Velic_solKx(
const double pos[],
double _sigma,
double _m, int _n,
- double _B,
+ double BB,
double vel[], double* presssure,
double total_stress[], double strain_rate[], double* viscosity );
@@ -51,7 +51,7 @@ void _Velic_solKx(
const double pos[],
double _sigma, /* density */
double _m, int _n, /* wavelength in z, wavenumber in x */
- double _B, /* viscosity parameter */
+ double BB, /* viscosity parameter */
double vel[], double* presssure,
double total_stress[], double strain_rate[], double* viscosity )
{
@@ -83,7 +83,7 @@ void _Velic_solKx(
/*************************************************************************/
/* rho = -sin(km*z)*cos(kn*x) */
Z = exp( 2.0 * B * x );
- B = _B; /* viscosity parameter must be non-zero*/
+ B = BB; /* viscosity parameter must be non-zero*/
km = _m*M_PI; /* solution valid for km not zero -- should get trivial solution if km=0 */
n = _n; /* solution valid for n not zero */
kn = (double)_n*M_PI;
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solKz/Analytic_solKz.h
--- a/SysTest/AnalyticPlugins/Velic_solKz/Analytic_solKz.h Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solKz/Analytic_solKz.h Fri Nov 25 16:04:18 2011 -0800
@@ -66,7 +66,7 @@
const double pos[],
double _sigma, /* density */
double _km, int _n, /* wavelength in z, wavenumber in x */
- double _B, /* viscosity parameter */
+ double BB, /* viscosity parameter */
double vel[], double* presssure,
double total_stress[], double strain_rate[] );
#endif
diff -r 9f0179721dab -r a2dae102598d SysTest/AnalyticPlugins/Velic_solKz/solKz.cxx
--- a/SysTest/AnalyticPlugins/Velic_solKz/solKz.cxx Tue Nov 22 12:55:21 2011 -0800
+++ b/SysTest/AnalyticPlugins/Velic_solKz/solKz.cxx Fri Nov 25 16:04:18 2011 -0800
@@ -7,7 +7,7 @@ void _Velic_solKz(
const double pos[],
double _sigma,
double _km, int _n,
- double _B,
+ double BB,
double vel[], double* presssure,
double total_stress[], double strain_rate[] );
@@ -50,7 +50,7 @@ void _Velic_solKz(
const double pos[],
double _sigma, /* density */
double _km, int _n, /* wavelength in z, wavenumber in x */
- double _B, /* viscosity parameter */
+ double BBB, /* viscosity parameter */
double vel[], double* presssure,
double total_stress[], double strain_rate[] )
{
@@ -85,7 +85,7 @@ void _Velic_solKz(
/*************************************************************************/
/* rho = -sigma*sin(km*z)*cos(kn*x) */
/* viscosity Z= exp(2*B*z) */
- B = _B; /* viscosity parameter must be non-zero*/
+ B = BBB; /* viscosity parameter must be non-zero*/
km = _km; /* solution valid for km not zero -- should get trivial solution if km=0 */
n = _n; /* solution valid for n not zero */
sigma = _sigma;
More information about the CIG-COMMITS
mailing list