Changed major-minor flags after a species is born.

This commit is contained in:
Harry Moffat 2008-05-19 23:10:04 +00:00
parent 275b3ce986
commit 884d2fc084

View file

@ -617,20 +617,34 @@ namespace VCSnonideal {
* Resurrect the species * Resurrect the species
*/ */
if (resurrect) { if (resurrect) {
if (Vphase->Existence == 0) Vphase->Existence = 1; bool phaseResurrected = false;
--m_numRxnMinorZeroed; if (Vphase->Existence == 0) {
#ifdef DEBUG_MODE Vphase->Existence = 1;
if (m_debug_print_lvl >= 2) { phaseResurrected = true;
plogf(" --- Zeroed species changed to major: ");
plogf("%-12s\n", m_speciesName[kspec].c_str());
} }
--m_numRxnMinorZeroed;
if (phaseResurrected) {
#ifdef DEBUG_MODE
if (m_debug_print_lvl >= 2) {
plogf(" --- Zeroed species changed to major: ");
plogf("%-12s\n", m_speciesName[kspec].c_str());
}
#endif #endif
m_rxnStatus[irxn] = VCS_SPECIES_MAJOR; m_rxnStatus[irxn] = VCS_SPECIES_MAJOR;
im = FALSE; MajorSpeciesHaveConverged = false;
MajorSpeciesHaveConverged = false; im = FALSE;
} else {
#ifdef DEBUG_MODE
if (m_debug_print_lvl >= 2) {
plogf(" --- Zeroed species changed to minor: ");
plogf("%-12s\n", m_speciesName[kspec].c_str());
}
#endif
m_rxnStatus[irxn] = VCS_SPECIES_MINOR;
}
if (m_deltaMolNumSpecies[kspec] > 0.0) { if (m_deltaMolNumSpecies[kspec] > 0.0) {
dx = m_deltaMolNumSpecies[kspec] * 0.01; dx = m_deltaMolNumSpecies[kspec] * 0.01;
m_molNumSpecies_new[kspec] = m_molNumSpecies_old[kspec] + dx; m_molNumSpecies_new[kspec] = m_molNumSpecies_old[kspec] + dx;
} else { } else {
m_molNumSpecies_new[kspec] = m_totalMolNum * VCS_DELETE_PHASE_CUTOFF * 10.; m_molNumSpecies_new[kspec] = m_totalMolNum * VCS_DELETE_PHASE_CUTOFF * 10.;