commit/enzo-dev: 4 new changesets

[commits...@bitbucket.org]

4 new commits in enzo-dev:

https://bitbucket.org/enzo/enzo-dev/commits/cac84ea5b475/
Changeset: cac84ea5b475
Branch: week-of-code
User: jwise77
Date: 2018-04-10 11:58:25+00:00
Summary: Bugfix to avoid NULL stars pointer if no sources exist in restart.
Affected #: 1 file

diff -r 149dd1d6513b -r cac84ea5b475 src/enzo/RestartPhotons.C
--- a/src/enzo/RestartPhotons.C
+++ b/src/enzo/RestartPhotons.C
@@ -148,21 +148,21 @@
/* Optically thin Lyman-Werner (H2) radiation field */

int NumberOfSources = 0;
- Star *cstar = AllStars->NextStar;
- while (cstar != NULL) {
- cstar = cstar->NextStar;
- NumberOfSources++;
- }
+ if (AllStars != NULL) {
+ Star *cstar = AllStars->NextStar;
+ while (cstar != NULL) {
+ cstar = cstar->NextStar;
+ NumberOfSources++;
+ }

- if (RadiativeTransferOpticallyThinH2)
- for (level = 0; level < MAX_DEPTH_OF_HIERARCHY; level++)
- for (Temp = LevelArray[level]; Temp; Temp = Temp->NextGridThisLevel) {
- if (Temp->GridData->InitializeTemperatureFieldForH2Shield() == FAIL) {
- ENZO_FAIL("Error in InitializeTemperatureFieldForH2Shield.\n");
+ if (RadiativeTransferOpticallyThinH2)
+ for (level = 0; level < MAX_DEPTH_OF_HIERARCHY; level++)
+ for (Temp = LevelArray[level]; Temp; Temp = Temp->NextGridThisLevel) {
+ Temp->GridData->InitializeTemperatureFieldForH2Shield();
+ Temp->GridData->AddH2Dissociation(AllStars, NumberOfSources);
}
- Temp->GridData->AddH2Dissociation(AllStars, NumberOfSources);
- }
-
+ }
+
return SUCCESS;

}


https://bitbucket.org/enzo/enzo-dev/commits/79bb2e9f6963/
Changeset: 79bb2e9f6963
Branch: week-of-code
User: jwise77
Date: 2018-04-17 20:25:37+00:00
Summary: Delete Radiation Pressure fields if turning RT off
Affected #: 1 file

diff -r cac84ea5b475 -r 79bb2e9f6963 src/enzo/RadiativeTransferInitialize.C
--- a/src/enzo/RadiativeTransferInitialize.C
+++ b/src/enzo/RadiativeTransferInitialize.C
@@ -78,7 +78,7 @@

/* Check for radiation fields and delete them */

- NumberOfObsoleteFields = 10;
+ NumberOfObsoleteFields = 13;
ObsoleteFields[0] = kphHI;
ObsoleteFields[1] = PhotoGamma;
ObsoleteFields[2] = kphHeI;
@@ -89,6 +89,9 @@
ObsoleteFields[7] = kphHM;
ObsoleteFields[8] = kdissH2II;
ObsoleteFields[9] = RaySegments;
+ ObsoleteFields[10] = RadPressure0;
+ ObsoleteFields[11] = RadPressure1;
+ ObsoleteFields[12] = RadPressure2;

for (level = 0; level < MAX_DEPTH_OF_HIERARCHY; level++)
for (Temp = LevelArray[level]; Temp; Temp = Temp->NextGridThisLevel)


https://bitbucket.org/enzo/enzo-dev/commits/3782b328420c/
Changeset: 3782b328420c
Branch: week-of-code
User: jwise77
Date: 2018-11-07 17:39:18+00:00
Summary: Avoiding extra indent in RestartPhotons
Affected #: 1 file

diff -r 79bb2e9f6963 -r 3782b328420c src/enzo/RestartPhotons.C
--- a/src/enzo/RestartPhotons.C
+++ b/src/enzo/RestartPhotons.C
@@ -147,21 +147,22 @@

/* Optically thin Lyman-Werner (H2) radiation field */

- int NumberOfSources = 0;
- if (AllStars != NULL) {
- Star *cstar = AllStars->NextStar;
- while (cstar != NULL) {
- cstar = cstar->NextStar;
- NumberOfSources++;
- }
+ if (AllStars == NULL)
+ return SUCCESS;

- if (RadiativeTransferOpticallyThinH2)
- for (level = 0; level < MAX_DEPTH_OF_HIERARCHY; level++)
- for (Temp = LevelArray[level]; Temp; Temp = Temp->NextGridThisLevel) {
- Temp->GridData->InitializeTemperatureFieldForH2Shield();
- Temp->GridData->AddH2Dissociation(AllStars, NumberOfSources);
- }
+ int NumberOfSources = 0;
+ Star *cstar = AllStars->NextStar;
+ while (cstar != NULL) {
+ cstar = cstar->NextStar;
+ NumberOfSources++;
}
+
+ if (RadiativeTransferOpticallyThinH2)
+ for (level = 0; level < MAX_DEPTH_OF_HIERARCHY; level++)
+ for (Temp = LevelArray[level]; Temp; Temp = Temp->NextGridThisLevel) {
+ Temp->GridData->InitializeTemperatureFieldForH2Shield();
+ Temp->GridData->AddH2Dissociation(AllStars, NumberOfSources);
+ }

return SUCCESS;



https://bitbucket.org/enzo/enzo-dev/commits/d3fe7886188c/
Changeset: d3fe7886188c
Branch: week-of-code
User: jwise77
Date: 2018-11-07 17:40:38+00:00
Summary: Merged in jwise77/clean-copy (pull request #427)

[bugfix] Ray tracing minor bugfixes

Approved-by: John Regan <johnanth...@gmail.com>
Approved-by: Corey Brummel-Smith <cdb...@my.fsu.edu>
Approved-by: Andrew Emerick <eme...@astro.columbia.edu>
Approved-by: Britton Smith <britto...@gmail.com>
Affected #: 2 files

diff -r 4c537ac40bce -r d3fe7886188c src/enzo/RadiativeTransferInitialize.C
--- a/src/enzo/RadiativeTransferInitialize.C
+++ b/src/enzo/RadiativeTransferInitialize.C
@@ -78,7 +78,7 @@

/* Check for radiation fields and delete them */

- NumberOfObsoleteFields = 10;
+ NumberOfObsoleteFields = 13;
ObsoleteFields[0] = kphHI;
ObsoleteFields[1] = PhotoGamma;
ObsoleteFields[2] = kphHeI;
@@ -89,6 +89,9 @@
ObsoleteFields[7] = kphHM;
ObsoleteFields[8] = kdissH2II;
ObsoleteFields[9] = RaySegments;
+ ObsoleteFields[10] = RadPressure0;
+ ObsoleteFields[11] = RadPressure1;
+ ObsoleteFields[12] = RadPressure2;

for (level = 0; level < MAX_DEPTH_OF_HIERARCHY; level++)
for (Temp = LevelArray[level]; Temp; Temp = Temp->NextGridThisLevel)

diff -r 4c537ac40bce -r d3fe7886188c src/enzo/RestartPhotons.C
--- a/src/enzo/RestartPhotons.C
+++ b/src/enzo/RestartPhotons.C
@@ -147,6 +147,9 @@

/* Optically thin Lyman-Werner (H2) radiation field */

+ if (AllStars == NULL)
+ return SUCCESS;
+
int NumberOfSources = 0;
Star *cstar = AllStars->NextStar;
while (cstar != NULL) {
@@ -157,12 +160,10 @@
if (RadiativeTransferOpticallyThinH2)
for (level = 0; level < MAX_DEPTH_OF_HIERARCHY; level++)
for (Temp = LevelArray[level]; Temp; Temp = Temp->NextGridThisLevel) {
- if (Temp->GridData->InitializeTemperatureFieldForH2Shield() == FAIL) {
- ENZO_FAIL("Error in InitializeTemperatureFieldForH2Shield.\n");
- }
+ Temp->GridData->InitializeTemperatureFieldForH2Shield();
Temp->GridData->AddH2Dissociation(AllStars, NumberOfSources);
}
-
+
return SUCCESS;

}

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.