commit/enzo-dev: 6 new changesets

[commits...@bitbucket.org]

6 new commits in enzo-dev:

https://bitbucket.org/enzo/enzo-dev/commits/b9a891acc143/
Changeset: b9a891acc143
Branch: week-of-code
User: aeme...@gmail.com
Date: 2018-11-26 17:23:44+00:00
Summary: Bugfix in Grid_WalkPhotonPackage to correctly calculate the number of rays
when on the root grid. Fixes a bit-shift bug that incorrectly set the
number of rays to zero on the root grid.
Affected #: 1 file

diff -r d3fe7886188c -r b9a891acc143 src/enzo/Grid_WalkPhotonPackage.C
--- a/src/enzo/Grid_WalkPhotonPackage.C
+++ b/src/enzo/Grid_WalkPhotonPackage.C
@@ -245,17 +245,17 @@

// solid angle associated with package (= 4 Pi/N_package[on this level])
uint64_t Hlevel = (*PP)->level, res = 2L, BRP = 12L;
- uint64_t Nlevel = (BRP * (res << (res*Hlevel-1)));
+ uint64_t Nlevel = (BRP * (1L << (res*Hlevel)));
double n_on_this_level = Nlevel;
double omega_package=4*M_PI/(n_on_this_level);
double dtheta = sqrt(omega_package);
if(n_on_this_level <= 0.0 || omega_package == INFINITY) {
fprintf(stdout, "%s: level = %llu\n", __FUNCTION__, level);
fprintf(stdout, "%s: 2*(*PP)->level-1 = %llu\n", __FUNCTION__, res*(*PP)->level-1);
- fprintf(stdout, "%s: 12 * (2 << (2*(*PP)->level-1)) = %llu\n", __FUNCTION__,
- BRP * (res << (res*(*PP)->level-1)));
+ fprintf(stdout, "%s: 12 * (1 << (2*(*PP)->level)) = %llu\n", __FUNCTION__,
+ BRP * (1L << (res*(*PP)->level)));
fprintf(stdout, "%s: Hlevel = %llu\n", __FUNCTION__, Hlevel);
- fprintf(stdout, "%s: Nlevel = %llu\n", __FUNCTION__, Nlevel);
+ fprintf(stdout, "%s: Nlevel = %lld\n", __FUNCTION__, Nlevel);
fprintf(stdout, "%s: n_on_this_level = %lf\n", __FUNCTION__, n_on_this_level);
ENZO_VFAIL("Computation of the number of pixels failed.\n"
"\t level = %llu\n", (*PP)->level);


https://bitbucket.org/enzo/enzo-dev/commits/130f1d839b13/
Changeset: 130f1d839b13
Branch: week-of-code
User: aeme...@gmail.com
Date: 2018-11-27 12:58:58+00:00
Summary: Changing lld back to llu in error message
Affected #: 1 file

diff -r b9a891acc143 -r 130f1d839b13 src/enzo/Grid_WalkPhotonPackage.C
--- a/src/enzo/Grid_WalkPhotonPackage.C
+++ b/src/enzo/Grid_WalkPhotonPackage.C
@@ -255,7 +255,7 @@
fprintf(stdout, "%s: 12 * (1 << (2*(*PP)->level)) = %llu\n", __FUNCTION__,
BRP * (1L << (res*(*PP)->level)));
fprintf(stdout, "%s: Hlevel = %llu\n", __FUNCTION__, Hlevel);
- fprintf(stdout, "%s: Nlevel = %lld\n", __FUNCTION__, Nlevel);
+ fprintf(stdout, "%s: Nlevel = %llu\n", __FUNCTION__, Nlevel);
fprintf(stdout, "%s: n_on_this_level = %lf\n", __FUNCTION__, n_on_this_level);
ENZO_VFAIL("Computation of the number of pixels failed.\n"
"\t level = %llu\n", (*PP)->level);


https://bitbucket.org/enzo/enzo-dev/commits/3264c5162c1d/
Changeset: 3264c5162c1d
Branch: week-of-code
User: aeme...@gmail.com
Date: 2018-11-27 21:54:58+00:00
Summary: Memory Leak Fix: SubgridFluxesEstimate is allocated for grids not on the current processor in CreateFluxes, but never deleted in FinalizeFluxes
Affected #: 1 file

diff -r 130f1d839b13 -r 3264c5162c1d src/enzo/FinalizeFluxes.C
--- a/src/enzo/FinalizeFluxes.C
+++ b/src/enzo/FinalizeFluxes.C
@@ -48,10 +48,11 @@
DeleteFluxes(SubgridFluxesEstimate[grid1][subgrid]);
delete SubgridFluxesEstimate[grid1][subgrid];
}
- delete [] SubgridFluxesEstimate[grid1];
-
}
-
+
+ delete [] SubgridFluxesEstimate[grid1];
+ SubgridFluxesEstimate[grid1] = NULL;
+
} // end of loop over grids
return SUCCESS;
}


https://bitbucket.org/enzo/enzo-dev/commits/a72c9384124d/
Changeset: a72c9384124d
Branch: week-of-code
User: aeme...@gmail.com
Date: 2018-11-27 21:55:41+00:00
Summary: Bdynamic to Bstatic compiler flag - should result in a 10-20% speed-up on Blue Waters
Affected #: 1 file

diff -r 3264c5162c1d -r a72c9384124d src/enzo/Make.mach.ncsa-bluewaters-gnu
--- a/src/enzo/Make.mach.ncsa-bluewaters-gnu
+++ b/src/enzo/Make.mach.ncsa-bluewaters-gnu
@@ -69,7 +69,7 @@
MACH_CXXFLAGS =
MACH_FFLAGS = -fno-second-underscore -m64
MACH_F90FLAGS = -fno-second-underscore -m64
-MACH_LDFLAGS = -Bdynamic
+MACH_LDFLAGS = -Bstatic

#-----------------------------------------------------------------------
# Optimization flags


https://bitbucket.org/enzo/enzo-dev/commits/81c6bcdb0d18/
Changeset: 81c6bcdb0d18
Branch: week-of-code
User: aeme...@gmail.com
Date: 2018-11-27 21:56:31+00:00
Summary: Bugfix: Initializing CosmologyTableLoga to NULL
Affected #: 1 file

diff -r a72c9384124d -r 81c6bcdb0d18 src/enzo/CosmologyReadParameters.C
--- a/src/enzo/CosmologyReadParameters.C
+++ b/src/enzo/CosmologyReadParameters.C
@@ -45,6 +45,7 @@
FinalRedshift = 0;
CosmologyTableNumberOfBins = 1000;
CosmologyTableLogt = NULL;
+ CosmologyTableLoga = NULL;
CosmologyTableLogaInitial = -6.0;
CosmologyTableLogaFinal = 0.0;
CosmologyTableLogtIndex = 0;


https://bitbucket.org/enzo/enzo-dev/commits/e932eeb11b87/
Changeset: e932eeb11b87
Branch: week-of-code
User: aeme...@gmail.com
Date: 2018-11-28 20:14:02+00:00
Summary: Minor edit Grid_WalkPhotonPackage.C: removing extra paranthesis
Affected #: 1 file

diff -r 81c6bcdb0d18 -r e932eeb11b87 src/enzo/Grid_WalkPhotonPackage.C
--- a/src/enzo/Grid_WalkPhotonPackage.C
+++ b/src/enzo/Grid_WalkPhotonPackage.C
@@ -245,7 +245,7 @@

// solid angle associated with package (= 4 Pi/N_package[on this level])
uint64_t Hlevel = (*PP)->level, res = 2L, BRP = 12L;
- uint64_t Nlevel = (BRP * (1L << (res*Hlevel)));
+ uint64_t Nlevel = BRP * (1L << (res*Hlevel));
double n_on_this_level = Nlevel;
double omega_package=4*M_PI/(n_on_this_level);
double dtheta = sqrt(omega_package);

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.