commit/enzo-dev: gbryan: Merged in jwise77/clean-copy (pull request #434)

[commits...@bitbucket.org]

1 new commit in enzo-dev:

https://bitbucket.org/enzo/enzo-dev/commits/9540a7fb1ec4/
Changeset: 9540a7fb1ec4
Branch: week-of-code
User: gbryan
Date: 2019-03-25 17:30:54+00:00
Summary: Merged in jwise77/clean-copy (pull request #434)

Reverting physical constant change

Approved-by: Britton Smith <britto...@gmail.com>
Approved-by: Greg Bryan <gbr...@astro.columbia.edu>
Approved-by: Andrew Emerick <aemer...@gmail.com>
Affected #: 2 files

diff -r 6df251e69893 -r 9540a7fb1ec4 src/enzo/Grid_PrepareGreensFunction.C
--- a/src/enzo/Grid_PrepareGreensFunction.C
+++ b/src/enzo/Grid_PrepareGreensFunction.C
@@ -53,13 +53,13 @@

/* Set the constant to be used. */

- float GravitationalConstant;
+ float GravConst_factor;
if (GridRank == 3)
- GravitationalConstant = -GravConst/(4.0*pi);
+ GravConst_factor = -GravitationalConstant/(4.0*pi);
if (GridRank == 2)
- GravitationalConstant = -GravConst*0.5/pi;
+ GravConst_factor = -GravitationalConstant*0.5/pi;
if (GridRank == 1)
- GravitationalConstant = -GravConst*0.5;
+ GravConst_factor = -GravitationalConstant*0.5;

/* Set Greens' function. */

@@ -78,12 +78,12 @@
r = max(r, GravitatingMassFieldCellSize);
r *= GravitatingMassFieldCellSize;
if (GridRank == 3)
- PotentialField[n] = GravitationalConstant/r;
+ PotentialField[n] = GravConst_factor/r;
if (GridRank == 2)
- PotentialField[n] = GravitationalConstant*log(r);
+ PotentialField[n] = GravConst_factor*log(r);
if (GridRank == 1)

- PotentialField[n] = GravitationalConstant*r;
+ PotentialField[n] = GravConst_factor*r;

}
}

diff -r 6df251e69893 -r 9540a7fb1ec4 src/enzo/PrepareIsolatedGreensFunction.C
--- a/src/enzo/PrepareIsolatedGreensFunction.C
+++ b/src/enzo/PrepareIsolatedGreensFunction.C
@@ -91,13 +91,13 @@

/* Set the constant to be used. */

- float GravitationalConstant;
+ float GravConst_factor;
if (GridRank == 3)
- GravitationalConstant = -GravConst*RealCellVolume/(4.0*pi);
+ GravConst_factor = -GravitationalConstant*RealCellVolume/(4.0*pi);
if (GridRank == 2)
- GravitationalConstant = GravConst*RealCellVolume/(2.0*pi);
+ GravConst_factor = GravitationalConstant*RealCellVolume/(2.0*pi);
if (GridRank == 1)
- GravitationalConstant = GravConst*RealCellVolume/2.0;
+ GravConst_factor = GravitationalConstant*RealCellVolume/2.0;

/* Set Greens' function. */

@@ -122,11 +122,11 @@
r = max(r, 0.38*RealCellWidth[0]);
// r *= GravitatingMassFieldCellSize;
if (GridRank == 3)
- GreensFunction->Data[n] = GravitationalConstant/r;
+ GreensFunction->Data[n] = GravConst_factor/r;
if (GridRank == 2)
- GreensFunction->Data[n] = GravitationalConstant*log(r);
+ GreensFunction->Data[n] = GravConst_factor*log(r);
if (GridRank == 1)
- GreensFunction->Data[n] = GravitationalConstant*r;
+ GreensFunction->Data[n] = GravConst_factor*r;
}
}
}

Repository URL: https://bitbucket.org/enzo/enzo-dev/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.