diff --git a/Cantera/python/setup.py.in b/Cantera/python/setup.py.in index 77e914bc7..a971c7e08 100644 --- a/Cantera/python/setup.py.in +++ b/Cantera/python/setup.py.in @@ -13,12 +13,16 @@ if @build_with_f2c@ <> 1: linkargs = '@LCXX_FLAGS@' numarray_incl = "@NUMARRAY_INC_DIR@" +numpy_incl = "@NUMPY_INC_DIR@" incdirs=["../../build/include", "src", "../clib/src"] if numarray_incl <> '': incdirs.append(numarray_incl) +if numpy_incl <> '': + incdirs.append(numpy_incl) + bllibstr = "@BLAS_LAPACK_LIBS@" bllibs = bllibstr.replace('-l',' ') bllist = bllibs.split() diff --git a/Cantera/src/equil/vcs_VolPhase.h b/Cantera/src/equil/vcs_VolPhase.h index 23d7c8e0a..808558a16 100644 --- a/Cantera/src/equil/vcs_VolPhase.h +++ b/Cantera/src/equil/vcs_VolPhase.h @@ -450,6 +450,23 @@ namespace VCSnonideal { vcs_SpeciesProperties * speciesProperty(const int kindex); //! int indicating whether the phase exists or not + /*! + * returns the m_existence int for the phase + * + * - VCS_PHASE_EXIST_ZEROEDPHASE = -6: Set to not exist by fiat from a + * higher level. + * This is used in phase stability boundary calculations + * - VCS_PHASE_EXIST_NO = 0: Doesn't exist currently + * - VCS_PHASE_EXIST_MINORCONC = 1: Exists, but the concentration is + * so low that an alternate + * method is used to calculate the total phase concentrations. + * - VCS_PHASE_EXIST_YES = 2 : Does exist currently + * - VCS_PHASE_EXIST_ALWAYS = 3: Always exists because it contains + * inerts which can't exist in any other phase. Or, + * the phase exists always because it consists of a single + * species, which is identified with the voltage, i.e., + * its an electron metal phase. + */ int exists() const; //! Set the existence flag in the object diff --git a/Cantera/src/equil/vcs_defs.h b/Cantera/src/equil/vcs_defs.h index 023d6285b..056859ff6 100644 --- a/Cantera/src/equil/vcs_defs.h +++ b/Cantera/src/equil/vcs_defs.h @@ -206,6 +206,16 @@ namespace VCSnonideal { */ #define VCS_SPECIES_ACTIVEBUTZERO -7 + //! Species lies in a multicomponent phase that is active, + //! but species concentration is zero due to stoich constraint + /*! + * The species lies in a multicomponent phase which + * currently does exist. Its concentration is currently + * identically zero, though the phase exists. This is + * a permament condition due to stoich constraints + */ +#define VCS_SPECIES_STOICHZERO -8 + //@} //! @name Phase Categories used during the iteration diff --git a/Cantera/src/equil/vcs_internal.h b/Cantera/src/equil/vcs_internal.h index 77c4f178e..a54fe3b5b 100644 --- a/Cantera/src/equil/vcs_internal.h +++ b/Cantera/src/equil/vcs_internal.h @@ -473,6 +473,8 @@ namespace VCSnonideal { */ void vcs_print_line(const char *str, int num); + const char *vcs_speciesType_string(int speciesStatus, int length = 100); + //! Print a string within a given space limit /*! * This routine limits the amount of the string that will be printed to a diff --git a/Cantera/src/equil/vcs_phaseStability.cpp b/Cantera/src/equil/vcs_phaseStability.cpp index 60f7c0f58..64a8a4d31 100644 --- a/Cantera/src/equil/vcs_phaseStability.cpp +++ b/Cantera/src/equil/vcs_phaseStability.cpp @@ -1,9 +1,5 @@ /* ======================================================================= */ -/* -------------------------------------------------- */ -/* | RCS Head Information on zuzax.pchem.sandia.gov | */ -/* -------------------------------------------------- */ /* $RCSfile$ */ -/* $Author$ */ /* $Date$ */ /* $Revision$ */ /* ======================================================================= */ @@ -50,12 +46,15 @@ namespace VCSnonideal { #endif /* - * Loop through all of the species in the phase + * Loop through all of the species in the phase. We say the phase + * can be popped, if there is one species in the phase that can be + * popped. */ for (int k = 0; k < Vphase->nSpecies(); k++) { int kspec = Vphase->spGlobalIndexVCS(k); int irxn = kspec - m_numComponents; if (irxn >= 0) { + int iPopPossible = true; for (int j = 0; j < m_numComponents; ++j) { if (m_elType[j] == VCS_ELEM_TYPE_ABSPOS) { double stoicC = m_stoichCoeffRxnMatrix[irxn][j]; @@ -64,24 +63,18 @@ namespace VCSnonideal { if (negChangeComp > 0.0) { // TODO: We may have to come up with a tolerance here if (m_molNumSpecies_old[j] <= VCS_DELETE_ELEMENTABS_CUTOFF*0.1) { -#ifdef DEBUG_MODE - if (m_debug_print_lvl >= 3) { - plogf(" --- vcs_popPhasePosssible() Phase %d (%s) can't be popped\n", - iphasePop, - Vphase->PhaseName.c_str()); - plogf(" --- Component %d (%s)will go negative\n", - j, m_speciesName[j].c_str()); - } -#endif - return false; + iPopPossible = false; } } } } } + if (iPopPossible == true) { + return true; + } } } - return true; + return false; } // Decision as to whether a phase pops back into existence @@ -604,7 +597,7 @@ namespace VCSnonideal { irxn = kspec - m_numComponents; double b = E_phi[k] / sum * (1.0 - sum_Xcomp); if (irxn >= 0) { - fracDelta_raw[k] = (sumFrac - fracDelta_old[k]) * b / (1.0 - b); + fracDelta_raw[k] = b; } } diff --git a/Cantera/src/equil/vcs_rxnadj.cpp b/Cantera/src/equil/vcs_rxnadj.cpp index 6bd036a82..0a4983045 100644 --- a/Cantera/src/equil/vcs_rxnadj.cpp +++ b/Cantera/src/equil/vcs_rxnadj.cpp @@ -105,14 +105,27 @@ namespace VCSnonideal { double trphmoles = tphmoles / m_totalMolNum; if (trphmoles > VCS_DELETE_PHASE_CUTOFF) { m_deltaMolNumSpecies[kspec] = m_totalMolNum * VCS_SMALL_MULTIPHASE_SPECIES; -#ifdef DEBUG_MODE + if (m_speciesStatus[kspec] == VCS_SPECIES_STOICHZERO) { + m_deltaMolNumSpecies[kspec] = 0.0; +#ifdef DEBUG_MODE + sprintf(ANOTE, + "MultSpec (%s): Species not born due to STOICH/PHASEPOP even though DG = %11.3E", + vcs_speciesType_string(m_speciesStatus[kspec], 15), + m_deltaGRxn_new[irxn]); +#endif + } else { + m_deltaMolNumSpecies[kspec] = m_totalMolNum * VCS_SMALL_MULTIPHASE_SPECIES; +#ifdef DEBUG_MODE sprintf(ANOTE, - "MultSpec: small species born again DG = %11.3E", + "MultSpec (%s): small species born again DG = %11.3E", + vcs_speciesType_string(m_speciesStatus[kspec], 15), m_deltaGRxn_new[irxn]); #endif + } } else { #ifdef DEBUG_MODE - sprintf(ANOTE, "MultSpec: phase come alive DG = %11.3E", + sprintf(ANOTE, "MultSpec (%s): phase come alive DG = %11.3E", + vcs_speciesType_string(m_speciesStatus[kspec], 15), m_deltaGRxn_new[irxn]); #endif Vphase = m_VolPhaseList[iph]; @@ -120,10 +133,12 @@ namespace VCSnonideal { m_deltaMolNumSpecies[kspec] = m_totalMolNum * 10.0 * VCS_DELETE_PHASE_CUTOFF / numSpPhase; } - --(m_numRxnMinorZeroed); + } else { #ifdef DEBUG_MODE - sprintf(ANOTE, "MultSpec: still dead DG = %11.3E", m_deltaGRxn_new[irxn]); + sprintf(ANOTE, "MultSpec (%s): still dead DG = %11.3E", + vcs_speciesType_string(m_speciesStatus[kspec], 15), + m_deltaGRxn_new[irxn]); #endif m_deltaMolNumSpecies[kspec] = 0.0; } diff --git a/Cantera/src/equil/vcs_solve.h b/Cantera/src/equil/vcs_solve.h index f31282499..64acf7ee0 100644 --- a/Cantera/src/equil/vcs_solve.h +++ b/Cantera/src/equil/vcs_solve.h @@ -1455,8 +1455,8 @@ public: */ int m_numRxnRdc; - //! Number of active species which are currently either zeroed out or - //! are minor species + //! Number of active species which are currently either treated as + //! minor species int m_numRxnMinorZeroed; //! Number of Phases in the problem @@ -1532,9 +1532,10 @@ public: //! Setting for whether to do an initial estimate /*! - * Initial estimate: 0 Do not estimate the solution at all. Use the supplied - * mole numbers as is. - * 1 Only do an estimate if the element abundances aren't satisfied. + * Initial estimate: 0 Do not estimate the solution at all. Use the + * supplied mole numbers as is. + * 1 Only do an estimate if the element abundances + * aren't satisfied. * -1 Force an estimate of the soln. Throw out the input * mole numbers. */ @@ -1814,6 +1815,11 @@ public: * of an equilibrium problem. * The species is soon "birthed" or "deleted". * - VCS_SPECIES_ACTIVEBUTZERO + * -8 -> The species lies in a multicomponent phase which + * currently does exist. Its concentration is currently + * identically zero, though the phase exists. This is + * a permament condition due to stoich constraints + * - VCS_SPECIES_STOICHZERO * */ std::vector m_speciesStatus; diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp index c3bd05227..5d8bae98b 100644 --- a/Cantera/src/equil/vcs_solve_TP.cpp +++ b/Cantera/src/equil/vcs_solve_TP.cpp @@ -418,44 +418,16 @@ namespace VCSnonideal { } if (iphasePop < 0) { /* - * Figure out whether we will calculate new reaction step sizes - * for the major species. - * -> We won't if all species are minors (im), OR - * all major species have already converged + * Figure out the new reaction step sizes + * for the major species (do minor species in the future too) */ - if (!(MajorSpeciesHaveConverged) && ! allMinorZeroedSpecies) { - soldel = vcs_RxnStepSizes(); - /* - If SOLDEL is true then we encountered a reaction between */ - /* - single-species-phase species, only, and have adjusted */ - /* - the mole number vector, W(), directly. In this case, */ - /* - we should immediately go back and recompute a new */ - /* - component basis, if the species that was zeroed was */ - /* - a component. SOLDEL is true when this is so. */ - if (soldel > 0) { - /* - We have changed the base mole number amongst single- */ - /* - species-phase species. However, we don't need to */ - /* - recaculate their chemical potentials because they */ - /* - are constant, anyway! */ - if (soldel == 2) { - goto L_COMPONENT_CALC; - } - /* - We have not changed the actual DG values for */ - /* - any species, even the one we deleted. Thus, */ - /* - we don't need to start over. */ - } - } else { -#ifdef DEBUG_MODE - if (m_debug_print_lvl >= 2) { - if (allMinorZeroedSpecies) { - plogf(" --- vcs_RxnStepSizes not called because all" - "species are minors\n"); - } else { - plogf(" --- vcs_RxnStepSizes not called because " - "all majors have converged\n"); - } - } -#endif + + soldel = vcs_RxnStepSizes(); + + if (soldel == 2) { + goto L_COMPONENT_CALC; } + } #ifdef DEBUG_MODE else { @@ -552,7 +524,7 @@ namespace VCSnonideal { /********************************************************************/ /********************** ZEROED OUT SPECIES **************************/ /********************************************************************/ - bool resurrect = true; + bool resurrect = (m_deltaMolNumSpecies[kspec] > 0.0); #ifdef DEBUG_MODE if (m_debug_print_lvl >= 3) { plogf(" --- %s currently zeroed (SpStatus=%-2d):", @@ -562,23 +534,22 @@ namespace VCSnonideal { m_molNumSpecies_old[kspec], m_deltaMolNumSpecies[kspec]); } #endif - // HKM Alternative is to not allow ds[] = 0.0 phases - // to pop back into existence. For esthetics, I'm allowing this. - // so that dg < 0.0 phases with zero mole numbers become components. - // This is also better, because that component will be the first - // one to pop into existence if there is a minute quantity of the element. - // This could change in the future. - //if (dg[irxn] >= 0.0 || ds[kspec] <= 0.0) { - if (m_deltaGRxn_new[irxn] >= 0.0 ) { + + if (m_deltaGRxn_new[irxn] >= 0.0 || !resurrect) { m_molNumSpecies_new[kspec] = m_molNumSpecies_old[kspec]; m_deltaMolNumSpecies[kspec] = 0.0; resurrect = false; #ifdef DEBUG_MODE - sprintf(ANOTE, "Species stays zeroed: DG = %11.4E", - m_deltaGRxn_new[irxn]); + sprintf(ANOTE, "Species stays zeroed: DG = %11.4E", m_deltaGRxn_new[irxn]); if (m_deltaGRxn_new[irxn] < 0.0) { - sprintf(ANOTE, "Species stays zeroed even though dg neg:DG = %11.4E, ds zeroed ", - m_deltaGRxn_new[irxn]); + if (m_speciesStatus[kspec] == VCS_SPECIES_STOICHZERO) { + sprintf(ANOTE, "Species stays zeroed even though dg neg due to " + "STOICH/PHASEPOP constraint: DG = %11.4E", + m_deltaGRxn_new[irxn]); + } else { + sprintf(ANOTE, "Species stays zeroed even though dg neg: DG = %11.4E, ds zeroed", + m_deltaGRxn_new[irxn]); + } } #endif } else { @@ -610,7 +581,6 @@ namespace VCSnonideal { //Vphase->setExistence(1); phaseResurrected = true; } - --m_numRxnMinorZeroed; if (phaseResurrected) { #ifdef DEBUG_MODE @@ -1281,28 +1251,6 @@ namespace VCSnonideal { for (kspec = 0; kspec < m_numSpeciesRdc; kspec++) { if (m_phaseID[kspec] == iph && m_molNumSpecies_old[kspec] > 0.0) { irxn = kspec - m_numComponents; - - // Both of these conditions are false and should be discarded. - // I think a proper special case would be if a species in a small phase - // had a significant contribution to total element total of a single - // element constraint. That's it. - - // if (kspec < m_numComponents) { - // if (m_molNumSpecies_old[kspec] > VCS_RELDELETE_SPECIES_CUTOFF) { - //soldel = 0; - //break; - //} - //} else { - //for (k = 0; k < m_numComponents; k++) { - //if (m_stoichCoeffRxnMatrix[irxn][k] != 0.0) { - // if (m_molNumSpecies_old[kspec]/m_molNumSpecies_old[k] > - //VCS_DELETE_PHASE_CUTOFF) { - // soldel = 0; - // break; - // } - //} - //} - //} } } if (soldel) { @@ -1559,8 +1507,8 @@ namespace VCSnonideal { m_speciesName[kspec].c_str()); } } -#endif - ++m_numRxnMinorZeroed; +#endif + ++m_numRxnMinorZeroed; } else if (speciesType == VCS_SPECIES_MINOR) { #ifdef DEBUG_MODE if (m_debug_print_lvl >= 2) { @@ -3676,9 +3624,7 @@ namespace VCSnonideal { // ---------- Treat special cases first --------------------- - if (kspec < m_numComponents) { - return VCS_SPECIES_COMPONENT; - } + if (m_speciesUnknownType[kspec] == VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) { return VCS_SPECIES_INTERFACIALVOLTAGE; } @@ -3691,20 +3637,39 @@ namespace VCSnonideal { // ---------- Treat zeroed out species first ---------------- if (m_molNumSpecies_old[kspec] <= 0.0) { - if (m_deltaGRxn_old[irxn] >= 0.0) { - /* - * We are here when the species is or should be zeroed out - */ - if (m_SSPhase[kspec]) { - return VCS_SPECIES_ZEROEDSS; - } else { - if (phaseExist >= VCS_PHASE_EXIST_YES) { - return VCS_SPECIES_ACTIVEBUTZERO; - } else if (phaseExist == VCS_PHASE_EXIST_ZEROEDPHASE) { - return VCS_SPECIES_ZEROEDPHASE; - } else { - return VCS_SPECIES_ZEROEDMS; - } + + if (m_tPhaseMoles_old[iph] <= 0.0) { + if (!m_SSPhase[kspec]) { + return VCS_SPECIES_ZEROEDMS; + } + } + + /* + * see if the species has an element + * which is so low that species will always be zero + * + */ + for (int j = 0; j < m_numElemConstraints; ++j) { + int elType = m_elType[j]; + if (elType == VCS_ELEM_TYPE_ABSPOS) { + double atomComp = m_formulaMatrix[j][kspec]; + if (atomComp > 0.0) { + double maxPermissible = m_elemAbundancesGoal[j] / atomComp; + if (maxPermissible < VCS_DELETE_MINORSPECIES_CUTOFF) { +#ifdef DEBUG_MODE + if (m_debug_print_lvl >= 2) { + plogf(" --- %s can not be nonzero because" + " needed element %s is zero\n", + m_speciesName[kspec].c_str(), (m_elementName[j]).c_str()); + } +#endif + if (m_SSPhase[kspec]) { + return VCS_SPECIES_ZEROEDSS; + } else { + return VCS_SPECIES_STOICHZERO; + } + } + } } } @@ -3717,68 +3682,76 @@ namespace VCSnonideal { * is also zeroed out. Then, don't pop the phase or the species back into * existence. */ - for (int j = 0; j < m_numComponents; ++j) { - double stoicC = m_stoichCoeffRxnMatrix[irxn][j]; - if (stoicC != 0.0) { - double negChangeComp = - stoicC; - if (negChangeComp > 0.0) { - if (m_molNumSpecies_old[j] < 1.0E-60) { + if (irxn >= 0) { + for (int j = 0; j < m_numComponents; ++j) { + double stoicC = m_stoichCoeffRxnMatrix[irxn][j]; + if (stoicC != 0.0) { + double negChangeComp = - stoicC; + if (negChangeComp > 0.0) { + if (m_molNumSpecies_old[j] < 1.0E-60) { #ifdef DEBUG_MODE - if (m_debug_print_lvl >= 2) { - plogf(" --- %s would have popped back into existance but" - " needed component %s is zero\n", - m_speciesName[kspec].c_str(), m_speciesName[j].c_str()); - } + if (m_debug_print_lvl >= 2) { + plogf(" --- %s is prevented from popping into existance because" + " a needed component to be consumed, %s, has a zero mole number\n", + m_speciesName[kspec].c_str(), m_speciesName[j].c_str()); + } #endif - if (m_SSPhase[kspec]) { - return VCS_SPECIES_ZEROEDSS; - } else { - return VCS_SPECIES_ACTIVEBUTZERO; + if (m_SSPhase[kspec]) { + return VCS_SPECIES_ZEROEDSS; + } else { + return VCS_SPECIES_STOICHZERO; + } + } + } else if (negChangeComp < 0.0) { + int jph = m_phaseID[j]; + vcs_VolPhase *jVPhase = m_VolPhaseList[jph]; + if (jVPhase->exists() <= 0) { +#ifdef DEBUG_MODE + if (m_debug_print_lvl >= 2) { + plogf(" --- %s is prevented from popping into existence because" + " a needed component %s is in a zeroed-phase that would be " + "popped into existence at the same time\n", + m_speciesName[kspec].c_str(), m_speciesName[j].c_str()); + } +#endif + if (m_SSPhase[kspec]) { + return VCS_SPECIES_ZEROEDSS; + } else { + return VCS_SPECIES_STOICHZERO; + } } } } } } - /* - * The Gibbs free energy for this species is such that - * it will pop back into existence. - * - * -> Set it to a major species in anticipation. - * -> An exception to this is if the species has an element - * which is so low to cause problems. - * - * We need to have a PHASE_CUTOFF here. This algorithm is - * insufficient. - */ - for (int j = 0; j < m_numElemConstraints; ++j) { - int elType = m_elType[j]; - if (elType == VCS_ELEM_TYPE_ABSPOS) { - double atomComp = m_formulaMatrix[j][kspec]; - if (atomComp > 0.0) { - double maxPermissible = m_elemAbundancesGoal[j] / atomComp; - if (maxPermissible < VCS_DELETE_MINORSPECIES_CUTOFF) { -#ifdef DEBUG_MODE - if (m_debug_print_lvl >= 2) { - plogf(" --- %s would have popped back into existance but" - " needed element %s is zero\n", - m_speciesName[kspec].c_str(), (m_elementName[j]).c_str()); - } -#endif - if (m_SSPhase[kspec]) { - return VCS_SPECIES_ZEROEDSS; - } else { - return VCS_SPECIES_ACTIVEBUTZERO; - } + + if (irxn >= 0) { + if (m_deltaGRxn_old[irxn] >= 0.0) { + /* + * We are here when the species is or should remain zeroed out + */ + if (m_SSPhase[kspec]) { + return VCS_SPECIES_ZEROEDSS; + } else { + if (phaseExist >= VCS_PHASE_EXIST_YES) { + return VCS_SPECIES_ACTIVEBUTZERO; + } else if (phaseExist == VCS_PHASE_EXIST_ZEROEDPHASE) { + return VCS_SPECIES_ZEROEDPHASE; + } else { + return VCS_SPECIES_ZEROEDMS; } } } } /* - * If the current phase already exists, set the emerging species to a - * minor species. + * If the current phase already exists, */ if (m_tPhaseMoles_old[iph] > 0.0) { - return VCS_SPECIES_MINOR; + if (m_SSPhase[kspec]) { + return VCS_SPECIES_MAJOR; + } else { + return VCS_SPECIES_ACTIVEBUTZERO; + } } /* @@ -3790,7 +3763,13 @@ namespace VCSnonideal { * fraction of the species in the phase, we could do * better here. */ - return VCS_SPECIES_MAJOR; + if (m_tPhaseMoles_old[iph] <= 0.0) { + if (m_SSPhase[kspec]) { + return VCS_SPECIES_MAJOR; + } else { + return VCS_SPECIES_ZEROEDMS; + } + } } // ---------- Treat species with non-zero mole numbers next ------------ @@ -3822,6 +3801,9 @@ namespace VCSnonideal { * phase and shares a non-zero stoichiometric coefficient, then * the current species is a major species. */ + if (irxn < 0) { + return VCS_SPECIES_MAJOR; + } else { double szAdj = m_scSize[irxn] * std::sqrt((double)m_numRxnTot); for (int k = 0; k < m_numComponents; ++k) { if (!(m_SSPhase[k])) { @@ -3831,7 +3813,8 @@ namespace VCSnonideal { } } } - } + } + } return VCS_SPECIES_MINOR; } /*****************************************************************************/ @@ -4579,13 +4562,19 @@ namespace VCSnonideal { * These species will formally always have zero * mole numbers in the solution vector. * - VCS_SPECIES_ZEROEDPHASE - * -7 -> The species lies in a multicomponent phase which + * -7 -> The species lies in a multicomponent phase which * currently does exist. Its concentration is currently * identically zero, though the phase exists. Note, this * is a temporary condition that exists at the start * of an equilibrium problem. * The species is soon "birthed" or "deleted". * - VCS_SPECIES_ACTIVEBUTZERO + * -8 -> The species lies in a multicomponent phase which + * currently does exist. Its concentration is currently + * identically zero, though the phase exists. This is + * a permament condition due to stoich constraints + * - VCS_SPECIES_STOICHZERO + * */ bool VCS_SOLVE::vcs_evaluate_speciesType() { int kspec; @@ -4602,8 +4591,19 @@ namespace VCSnonideal { #endif for (kspec = 0; kspec < m_numSpeciesTot; ++kspec) { m_speciesStatus[kspec] = vcs_species_type(kspec); -#ifdef DEBUG_MODE - if (m_debug_print_lvl >= 2) { +#ifdef DEBUG_MODE + if (m_debug_print_lvl >= 5) { + plogf(" --- %-16s: ", m_speciesName[kspec].c_str()); + if (kspec < m_numComponents) { + plogf("(COMP) "); + } else { + plogf(" "); + } + plogf(" %10.3g ", m_molNumSpecies_old[kspec]); + const char *sString = vcs_speciesType_string(m_speciesStatus[kspec], 100); + plogf("%s\n", sString); + + } else if (m_debug_print_lvl >= 2) { if (m_speciesStatus[kspec] != VCS_SPECIES_MINOR) { switch (m_speciesStatus[kspec]) { case VCS_SPECIES_COMPONENT: @@ -4628,6 +4628,10 @@ namespace VCSnonideal { plogf(" --- Zeroed Species in an active MS phase (tmp): %-s\n", m_speciesName[kspec].c_str()); break; + case VCS_SPECIES_STOICHZERO: + plogf(" --- Zeroed Species in an active MS phase (Stoich Constraint): %-s\n", + m_speciesName[kspec].c_str()); + break; case VCS_SPECIES_INTERFACIALVOLTAGE: plogf(" --- InterfaceVoltage Species: %-s\n", m_speciesName[kspec].c_str()); break; diff --git a/Cantera/src/equil/vcs_util.cpp b/Cantera/src/equil/vcs_util.cpp index 5c20b3356..21541b857 100644 --- a/Cantera/src/equil/vcs_util.cpp +++ b/Cantera/src/equil/vcs_util.cpp @@ -413,8 +413,77 @@ namespace VCSnonideal { plogendl(); } - /***************************************************************************/ - /************************************************************************ **/ + + const char *vcs_speciesType_string(int speciesStatus, int length) { + char *sss; + switch (speciesStatus) { + case VCS_SPECIES_COMPONENT: + sss = "Component Species"; + break; + case VCS_SPECIES_MAJOR: + sss ="Major Species"; + break; + case VCS_SPECIES_MINOR: + sss ="Minor Species"; + break; + case VCS_SPECIES_ZEROEDPHASE: + if (length < 48) { + sss = "Set Zeroed-Phase"; + } else { + sss ="Purposely Zeroed-Phase Species (not in problem)"; + } + break; + case VCS_SPECIES_ZEROEDMS: + if (length < 23) { + sss = "Zeroed-MS Phase"; + } else { + sss ="Zeroed-MS Phase Species"; + } + break; + case VCS_SPECIES_ZEROEDSS: + if (length < 23) { + sss = "Zeroed-SS Phase"; + } else { + sss ="Zeroed-SS Phase Species"; + } + break; + case VCS_SPECIES_DELETED: + if (length < 22) { + sss = "Deleted Species"; + } else if (length < 40) { + sss = "Deleted-Small Species"; + } else { + sss ="Deleted-Small Species in a MS phase"; + } + break; + case VCS_SPECIES_ACTIVEBUTZERO: + if (length < 47) { + sss = "Tmp Zeroed in MS"; + } else { + sss ="Zeroed Species in an active MS phase (tmp)"; + } + break; + case VCS_SPECIES_STOICHZERO: + if (length < 56) { + sss = "Stoich Zeroed in MS"; + } else { + sss ="Zeroed Species in an active MS phase (Stoich Constraint)"; + } + break; + case VCS_SPECIES_INTERFACIALVOLTAGE: + if (length < 29) { + sss = "InterfaceVoltage"; + } else { + sss ="InterfaceVoltage Species"; + } + break; + default: + sss = "unknown species type"; + } + return sss; + } + + /************************************************************************ **/ void vcs_print_stringTrunc(const char *str, int space, int alignment) diff --git a/config.h.in b/config.h.in index 8b7c70a3a..95cf514fe 100755 --- a/config.h.in +++ b/config.h.in @@ -103,9 +103,17 @@ typedef int ftnlen; // Fortran hidden string length type #undef PYTHON_EXE // If this is defined, the Cantera Python interface will use the -// Numeric package; otherwise, it will use numarray. +// Numeric package #undef HAS_NUMERIC +// If this is defined, the Cantera Python interface will use the +// numarray package +#undef HAS_NUMARRAY + +// If this is defined, the Cantera Python interface will use the +// numpy package +#undef HAS_NUMPY + // If this is defined, then python will not be assumed to be // present to support conversions #undef HAS_NO_PYTHON diff --git a/configure b/configure index 44d0cf07a..d454c79d3 100755 --- a/configure +++ b/configure @@ -1,82 +1,25 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for Cantera 1.7.0. +# Generated by GNU Autoconf 2.59 for Cantera 1.7.0. # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -86,60 +29,33 @@ else fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - # Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done +$as_unset ENV MAIL MAILPATH PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -147,391 +63,157 @@ fi # Name of the executable. -as_me=`$as_basename -- "$0" || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + for as_base in sh bash ksh sh5; do + case $as_dir in /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +;; + esac # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, t loop - s/-\n.*// + s,-$,, + s,^['$as_cr_digits']*\n,, ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno # Exit status is that of the last command. exit } -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then + +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links as_ln_s='cp -p' + else + as_ln_s='ln -s' fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -540,28 +222,7 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,27 +231,39 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH -exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +exec 6>&1 + # # Initializations. # ac_default_prefix=/usr/local -ac_clean_files= ac_config_libobj_dir=. -LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} + # Identity of this package. PACKAGE_NAME='Cantera' PACKAGE_TARNAME='cantera' @@ -601,254 +274,46 @@ PACKAGE_BUGREPORT='' # Factoring default headers for most tests. ac_includes_default="\ #include -#ifdef HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H # include #endif -#ifdef HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H # include #endif -#ifdef STDC_HEADERS +#if STDC_HEADERS # include # include #else -# ifdef HAVE_STDLIB_H +# if HAVE_STDLIB_H # include # endif #endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H # include # endif # include #endif -#ifdef HAVE_STRINGS_H +#if HAVE_STRINGS_H # include #endif -#ifdef HAVE_INTTYPES_H +#if HAVE_INTTYPES_H # include +#else +# if HAVE_STDINT_H +# include +# endif #endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H +#if HAVE_UNISTD_H # include #endif" -ac_subst_vars='LTLIBOBJS -LIBOBJS -INSTALL_VERBOSE -INSTALL_abs -TSCOMPARE_abs -EXTRA_LINK -LDSHARED -SO -math_libs -EXE_EXT -OBJ_EXT -CXX_EXT -F77_EXT -mex_ext -SHARED_CTLIB -OS_IS_CYGWIN -OS_IS_WIN -OS_IS_DARWIN -precompile_headers -F90LIBS -F90BUILDFLAGS -F90FLAGS -BUILD_F90 -F90 -FLIBS -ac_ct_F77 -FFLAGS -F77 -HAVE_STRIPSYMBOLS -LCXX_END_LIBS -LCXX_FLAGS -CXX_INCLUDES -SHARED -SOEXT -EGREP -GREP -CXXCPP -ac_ct_CC -CFLAGS -CC -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -PIC -export_name -BUILD_CLIB -BUILD_MATLAB -MATLAB_CMD -CVSTAG -CANTERA_PYTHON_HOME -NUMARRAY_HOME -NUMARRAY_INC_DIR -BUILD_PYTHON -PYTHON_CMD -CT_SHARED_LIB -CANTERA_CORE_LIBS_DEP -CANTERA_CORE_LIBS -RAW_LIBS_DEP -INSTALL_LIBS_DEP -LOCAL_LIBS_DEP -LOCAL_LIBS -LOCAL_LIB_DIRS -BOOST_LIB_DIR -F2C_SYSTEMLIB -build_f2c_lib -build_with_f2c -BLAS_LAPACK_DIR -BLAS_LAPACK_LINK -BLAS_LAPACK_LIBS -build_blas -build_lapack -PURIFY -BOOST_LIB -BOOST_INCLUDE -COMPILE_H298MODIFY_CAPABILITY -COMPILE_VCSNONIDEAL -LIB_DIR -BUILD_CK -KERNEL_OBJ -KERNEL -WITH_REACTORS -COMPILE_RXNPATH -COMPILE_HETEROKIN -COMPILE_KINETICS -NEED_CATHERMO -COMPILE_ELECTROLYTES -COMPILE_IDEAL_SOLUTIONS -phase_header_files -phase_object_files -COMPILE_PURE_FLUIDS -CANTERA_DEBUG_MODE -sundials_lib_dep -sundials_lib -sundials_lib_dir -sundials_include -IDA_LIBS -CVODE_LIBS -use_sundials -OBJEXT -EXEEXT -ac_ct_CXX -CPPFLAGS -LDFLAGS -CXXFLAGS -CXX -INCL_USER_CODE -USERDIR -CXX_DEPENDS -RANLIB -DO_RANLIB -ARCHIVE -GRAPHVIZDIR -MAKE -buildbin -buildlib -buildinc -ctroot -username -target_os -target_vendor -target_cpu -target -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -ct_mandir -ct_dir -ct_docdir -ct_tutdir -ct_templdir -ct_demodir -ct_datadir -ct_incroot -ct_incdir -ct_bindir -ct_libdir -homedir -ctversion -python_win_prefix -python_prefix -local_python_inst -local_inst -USE_CLIB_DLL -CVF_LIBDIR -ldemulationarg -BITCHANGE -BITHARDWARE -BITCOMPILE -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include sundials_lib_dir sundials_lib sundials_lib_dep CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR COMPILE_VCSNONIDEAL COMPILE_H298MODIFY_CAPABILITY BOOST_INCLUDE BOOST_LIB PURIFY build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_LINK BLAS_LAPACK_DIR build_with_f2c build_f2c_lib F2C_SYSTEMLIB BOOST_LIB_DIR LOCAL_LIB_DIRS LOCAL_LIBS LOCAL_LIBS_DEP INSTALL_LIBS_DEP RAW_LIBS_DEP CANTERA_CORE_LIBS CANTERA_CORE_LIBS_DEP CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMPY_INC_DIR NUMPY_HOME NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name PIC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 FLIBS F90 BUILD_F90 F90FLAGS F90BUILDFLAGS F90LIBS precompile_headers OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS' ac_subst_files='' -ac_user_opts=' -enable_option_checking -' - ac_precious_vars='build_alias -host_alias -target_alias -CXX -CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS -CCC -CC -CFLAGS -CXXCPP -F77 -FFLAGS' - # Initialize some variables set by options. ac_init_help= ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -871,48 +336,34 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' +datadir='${prefix}/share' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' +infodir='${prefix}/info' +mandir='${prefix}/man' ac_prev= -ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option + eval "$ac_prev=\$ac_option" ac_prev= continue fi - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -934,61 +385,33 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad) + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) datadir=$ac_optarg ;; - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; esac - eval enable_$ac_useropt=\$ac_optarg ;; + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1015,12 +438,6 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -1045,16 +462,13 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -1119,16 +533,6 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -1179,38 +583,26 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + ac_package=`echo $ac_package| sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; esac - eval with_$ac_useropt=\$ac_optarg ;; + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -1230,7 +622,7 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1239,16 +631,17 @@ Try \`$0 --help' for more information." >&2 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1257,39 +650,31 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix do - eval ac_val=\$$ac_var - # Remove trailing slashes. + eval ac_val=$`echo $ac_var` case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac - # Be sure to have absolute directory names. +done + +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir +do + eval ac_val=$`echo $ac_var` case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -1303,7 +688,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1316,76 +701,90 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + # Try the directory containing this script, then its parent. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then + if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + else + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. + fi fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CXX_set=${CXX+set} +ac_env_CXX_value=$CXX +ac_cv_env_CXX_set=${CXX+set} +ac_cv_env_CXX_value=$CXX +ac_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_env_CXXFLAGS_value=$CXXFLAGS +ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_cv_env_CXXFLAGS_value=$CXXFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_CXXCPP_set=${CXXCPP+set} +ac_env_CXXCPP_value=$CXXCPP +ac_cv_env_CXXCPP_set=${CXXCPP+set} +ac_cv_env_CXXCPP_value=$CXXCPP +ac_env_F77_set=${F77+set} +ac_env_F77_value=$F77 +ac_cv_env_F77_set=${F77+set} +ac_cv_env_F77_value=$F77 +ac_env_FFLAGS_set=${FFLAGS+set} +ac_env_FFLAGS_value=$FFLAGS +ac_cv_env_FFLAGS_set=${FFLAGS+set} +ac_cv_env_FFLAGS_value=$FFLAGS # # Report the --help message. @@ -1414,11 +813,14 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] +_ACEOF + + cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1428,25 +830,18 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/cantera] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --infodir=DIR info documentation [PREFIX/info] + --mandir=DIR man documentation [PREFIX/man] _ACEOF cat <<\_ACEOF @@ -1469,9 +864,8 @@ Some influential environment variables: CXXFLAGS C++ compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory CC C compiler command CFLAGS C compiler flags CXXCPP C++ preprocessor @@ -1482,88 +876,120 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF -ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. + ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue + test -d $ac_dir || continue ac_builddir=. -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi case $srcdir in - .) # We are building in place. + .) # No --srcdir option. We are building in place. ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + cd $ac_dir + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + echo + $SHELL $ac_srcdir/configure.gnu --help=recursive + elif test -f $ac_srcdir/configure; then + echo + $SHELL $ac_srcdir/configure --help=recursive + elif test -f $ac_srcdir/configure.ac || + test -f $ac_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi + cd $ac_popdir done fi -test -n "$ac_init_help" && exit $ac_status +test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF Cantera configure 1.7.0 -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.59 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit + exit 0 fi -cat >config.log <<_ACEOF +exec 5>config.log +cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Cantera $as_me 1.7.0, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ _ACEOF -exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1582,7 +1008,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1594,9 +1020,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + echo "PATH: $as_dir" done -IFS=$as_save_IFS } >&5 @@ -1618,6 +1043,7 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= +ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1628,8 +1054,8 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -1650,7 +1076,9 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " ;; esac done @@ -1661,8 +1089,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1675,35 +1103,20 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done +{ (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; - esac | - sort -) + *) + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} echo cat <<\_ASBOX @@ -1714,28 +1127,22 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## +## ------------- ## +## Output files. ## +## ------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1747,24 +1154,26 @@ _ASBOX ## ----------- ## _ASBOX echo - cat confdefs.h + sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status -' 0 + ' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h # Predefined preprocessor variables. @@ -1794,24 +1203,18 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue +for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1821,45 +1224,38 @@ done # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1869,39 +1265,13 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi - - - - - - - - - - - - - - - - - - - - - - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1909,40 +1279,59 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers config.h" + + + + + + + + + + + + + + + + + + + + + + + + + + ac_config_headers="$ac_config_headers config.h" # AC_CONFIG_AUX_DIR(.) # AC_CONFIG_SRCDIR(./License.txt) ac_aux_dir= -for ac_dir in config "$srcdir"/config; do - if test -f "$ac_dir/install-sh"; then +for ac_dir in config $srcdir/config; do + if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f "$ac_dir/install.sh"; then + elif test -f $ac_dir/install.sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f "$ac_dir/shtool"; then + elif test -f $ac_dir/shtool; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;} { (exit 1); exit 1; }; } fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. if test -z $CANTERA_VERSION ; then @@ -2169,123 +1558,79 @@ ct_mandir=${prefix} # Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } -fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -{ $as_echo "$as_me:$LINENO: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } +echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } -fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -$as_echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac +echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # The aliases save the names the user supplied, while $host etc. @@ -2404,7 +1749,7 @@ if test -n "$USER_SRC_DIR"; then USERDIR=$USER_SRC_DIR; INCL_USER_CODE=1; fi -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -2430,24 +1775,20 @@ if test "$USE_SUNDIALS" = "default"; then # SUNDIALS_LIB_DIR had a space in it, despite use of double quotes everywhere #ldsave="$LDFLAGS" #LDFLAGS='-L'"$SUNDIALS_LIB_DIR"' '"$ldsave" -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -2458,40 +1799,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -2502,81 +1841,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi + CXX=$ac_ct_CXX fi - fi -fi + # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF @@ -2595,150 +1904,111 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -$as_echo_n "checking for C++ compiler default output file name... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 +echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 +echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext break;; * ) break;; esac done -test "$ac_cv_exeext" = no && ac_cv_exeext= - else - ac_file='' -fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables +{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ compiler cannot create executables +echo "$as_me: error: C++ compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } + { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 -# Check that the compiler produces executables we can run. If not, either +# Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -$as_echo_n "checking whether the C++ compiler works... " >&6; } +echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 +echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs. + { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C++ compiled programs. +echo "$as_me: error: cannot run C++ compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi fi fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either +# Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -2747,33 +2017,32 @@ $as_echo "$ac_try_echo") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext break;; * ) break;; esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2791,48 +2060,39 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2853,54 +2113,50 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2916,121 +2172,38 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - +ac_cv_prog_cxx_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -3046,17 +2219,123 @@ else CXXFLAGS= fi fi -ac_ext=cpp +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for CVodeCreate in -lsundials_cvodes" >&5 -$as_echo_n "checking for CVodeCreate in -lsundials_cvodes... " >&6; } +echo "$as_me:$LINENO: checking for CVodeCreate in -lsundials_cvodes" >&5 +echo $ECHO_N "checking for CVodeCreate in -lsundials_cvodes... $ECHO_C" >&6 if test "${ac_cv_lib_sundials_cvodes_CVodeCreate+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsundials_cvodes \ @@ -3068,58 +2347,57 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char CVodeCreate (); int main () { -return CVodeCreate (); +CVodeCreate (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_sundials_cvodes_CVodeCreate=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_sundials_cvodes_CVodeCreate=no +ac_cv_lib_sundials_cvodes_CVodeCreate=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sundials_cvodes_CVodeCreate" >&5 -$as_echo "$ac_cv_lib_sundials_cvodes_CVodeCreate" >&6; } -if test "x$ac_cv_lib_sundials_cvodes_CVodeCreate" = x""yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_sundials_cvodes_CVodeCreate" >&5 +echo "${ECHO_T}$ac_cv_lib_sundials_cvodes_CVodeCreate" >&6 +if test $ac_cv_lib_sundials_cvodes_CVodeCreate = yes; then use_sundials=1 else use_sundials=0 @@ -3920,10 +3198,10 @@ if test "$PYTHON_CMD" = "default" -o \ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PYTHON_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PYTHON_CMD in [\\/]* | ?:[\\/]*) @@ -3936,27 +3214,26 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON_CMD="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi PYTHON_CMD=$ac_cv_path_PYTHON_CMD -if test -n "$PYTHON_CMD"; then - { $as_echo "$as_me:$LINENO: result: $PYTHON_CMD" >&5 -$as_echo "$PYTHON_CMD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +if test -n "$PYTHON_CMD"; then + echo "$as_me:$LINENO: result: $PYTHON_CMD" >&5 +echo "${ECHO_T}$PYTHON_CMD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi test -n "$PYTHON_CMD" && break done @@ -3980,44 +3257,117 @@ cat >>confdefs.h <<_ACEOF _ACEOF +USE_NUMARRAY='y' + if test "$USE_NUMERIC" = "y"; then +USE_NUMARRAY='n' +USE_NUMPY='n' cat >>confdefs.h <<\_ACEOF #define HAS_NUMERIC 1 _ACEOF fi -if test -n "$NUMARRAY_INC_DIR" ; then - echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" -else - NUMARRAY_INC_DIR="" - if test -n "$NUMARRAY_HOME"; then - dir5="$NUMARRAY_HOME/include/python2.5" - if test -d $dir5 ; then - NUMARRAY_INC_DIR=$dir5 +if test "$USE_NUMPY" = "y"; then +USE_NUMARRAY='n' +cat >>confdefs.h <<\_ACEOF +#define HAS_NUMPY 1 +_ACEOF + +fi + +if test "$USE_NUMARRAY" = "y"; then +cat >>confdefs.h <<\_ACEOF +#define HAS_NUMARRAY 1 +_ACEOF + +fi + +if test "$USE_NUMARRAY" = "y"; then + if test -n "$NUMARRAY_INC_DIR" ; then + echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" else - dir4="$NUMARRAY_HOME/include/python2.4" - if test -d $dir4 ; then - NUMARRAY_INC_DIR=$dir4 + NUMARRAY_INC_DIR="" + if test -n "$NUMARRAY_HOME"; then + dir5="$NUMARRAY_HOME/include/python2.5" + if test -d $dir5 ; then + NUMARRAY_INC_DIR=$dir5 else - dir3="$NUMARRAY_HOME/include/python2.3" - if test -d $dir3 ; then - NUMARRAY_INC_DIR=$dir3 + dir4="$NUMARRAY_HOME/include/python2.4" + if test -d $dir4 ; then + NUMARRAY_INC_DIR=$dir4 else - dir1="$NUMARRAY_HOME/include/python" - if test -d $dir1 ; then - NUMARRAY_INC_DIR=$dir1 + dir3="$NUMARRAY_HOME/include/python2.3" + if test -d $dir3 ; then + NUMARRAY_INC_DIR=$dir3 else - echo "WARNING: NUMARRAY include dir $dir1 does not exist." - NUMARRAY_INC_DIR=$dir1 + dir1="$NUMARRAY_HOME/include/python" + if test -d $dir1 ; then + NUMARRAY_INC_DIR=$dir1 + else + echo "WARNING: NUMARRAY include dir $dir1 does not exist." + NUMARRAY_INC_DIR=$dir1 + fi fi fi fi + echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" + fi fi - echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" - fi +else + NUMARRAY_INC_DIR="" + NUMARRAY_HOME="" fi + +if test "$USE_NUMPY" = "y"; then + if test -n "$NUMPY_INC_DIR" ; then + echo "setting NUMPY_INC_DIR to $NUMPY_INC_DIR" + else + NUMPY_INC_DIR="" + if test -n "$NUMPY_HOME"; then + dir6="$NUMPY_HOME/include/python2.6" + if test -d $dir6 ; then + NUMPY_INC_DIR=$dir6 + else + dir5="$NUMPY_HOME/include/python2.5" + if test -d $dir5 ; then + NUMPY_INC_DIR=$dir5 + else + dir4="$NUMPY_HOME/include/python2.4" + if test -d $dir4 ; then + NUMPY_INC_DIR=$dir4 + else + dir3="$NUMPY_HOME/include/python2.3" + if test -d $dir3 ; then + NUMPY_INC_DIR=$dir3 + else + dir2="$NUMPY_HOME/include/python2.2" + if test -d $dir2 ; then + NUMPY_INC_DIR=$dir2 + else + dir1="$NUMPY_HOME/include/python" + if test -d $dir1 ; then + NUMPY_INC_DIR=$dir1 + else + echo "WARNING: NUMPY include dir $dir1 does not exist." + NUMPY_INC_DIR=$dir1 + fi + fi + fi + fi + fi + fi + echo "setting NUMPY_INC_DIR to $NUMPY_INC_DIR" + fi + fi +else + NUMPY_INC_DIR="" + NUMPY_HOME="" +fi + + + # this fails, at least on a Mac. By default, numarray include files # are installed in the include directory in the Python framework. This # does not require setting NUMARRAY_INC_DIR, so testing that it is @@ -4039,6 +3389,7 @@ fi + #-------------------------- # CVS Tag #-------------------------- @@ -4060,10 +3411,10 @@ if test "$BUILD_MATLAB_TOOLBOX" != "n"; then "$MATLAB_CMD"x = "x"; then # Extract the first word of "matlab", so it can be a program name with args. set dummy matlab; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MATLAB_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MATLAB_CMD in [\\/]* | ?:[\\/]*) @@ -4076,28 +3427,27 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MATLAB_CMD="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_MATLAB_CMD" && ac_cv_path_MATLAB_CMD=""none"" ;; esac fi MATLAB_CMD=$ac_cv_path_MATLAB_CMD -if test -n "$MATLAB_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MATLAB_CMD" >&5 -$as_echo "$MATLAB_CMD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +if test -n "$MATLAB_CMD"; then + echo "$as_me:$LINENO: result: $MATLAB_CMD" >&5 +echo "${ECHO_T}$MATLAB_CMD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi if test "$MATLAB_CMD" = "none"; then MATLAB_CMD=`find /*/MATLAB*/bin/m* -name matlab` @@ -4117,8 +3467,8 @@ fi echo "Windows MATLAB command: ${MATLAB_CMD}" fi - { $as_echo "$as_me:$LINENO: checking MATLAB ($MATLAB_CMD)" >&5 -$as_echo_n "checking MATLAB ($MATLAB_CMD)... " >&6; } + echo "$as_me:$LINENO: checking MATLAB ($MATLAB_CMD)" >&5 +echo $ECHO_N "checking MATLAB ($MATLAB_CMD)... $ECHO_C" >&6 rm -f diary cat >> testmat.m << EOF diary; @@ -4221,12 +3571,11 @@ echo 'checking for Position independent code command ... ' $PIC # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -4245,7 +3594,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4255,43 +3604,30 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 fi fi done done ;; esac - done -IFS=$as_save_IFS -rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the value is a relative name. + # removed, or if the path is relative. INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -4355,24 +3691,20 @@ if test "x$OS_IS_WIN" = "x1"; then #CXX=cl.exe #CC=cl.exe #export CXX - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -4383,40 +3715,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -4427,87 +3757,57 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi + CXX=$ac_ct_CXX fi - fi -fi + # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4528,54 +3828,50 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4591,121 +3887,38 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - +ac_cv_prog_cxx_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -4721,7 +3934,113 @@ else CXXFLAGS= fi fi -ac_ext=cpp +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4735,10 +4054,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4749,36 +4068,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -4789,49 +4106,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi + CC=$ac_ct_CC else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4842,36 +4148,76 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4883,18 +4229,17 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -4912,25 +4257,24 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4941,40 +4285,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -4985,96 +4327,64 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CC" && break done - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi + CC=$ac_ct_CC fi fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5095,54 +4405,50 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5158,121 +4464,38 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - +ac_cv_prog_cc_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -5288,12 +4511,12 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_c89=no + ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5327,17 +4550,12 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get + as 'x'. The following induces an error, until -std1 is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ + that's true only with -std1. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -5352,59 +4570,206 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break +rm -f conftest.err conftest.$ac_objext done -rm -f conftest.$ac_ext +rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; esac +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -ac_ext=cpp +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5416,24 +4781,20 @@ else # Determines the CXX compiler to use # export CXX -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -5444,40 +4805,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -5488,87 +4847,57 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi + CXX=$ac_ct_CXX fi - fi -fi + # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5589,54 +4918,50 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5652,121 +4977,38 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - +ac_cv_prog_cxx_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -5782,7 +5024,113 @@ else CXXFLAGS= fi fi -ac_ext=cpp +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5796,10 +5144,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5810,36 +5158,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -5850,49 +5196,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi + CC=$ac_ct_CC else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5903,36 +5238,76 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5944,18 +5319,17 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -5973,25 +5347,24 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -6002,40 +5375,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -6046,96 +5417,64 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CC" && break done - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi + CC=$ac_ct_CC fi fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6156,54 +5495,50 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6219,121 +5554,38 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - +ac_cv_prog_cc_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -6349,12 +5601,12 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_c89=no + ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6388,17 +5640,12 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get + as 'x'. The following induces an error, until -std1 is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ + that's true only with -std1. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -6413,59 +5660,206 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break +rm -f conftest.err conftest.$ac_objext done -rm -f conftest.$ac_ext +rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; esac +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -ac_ext=cpp +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6473,8 +5867,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ability to precompile headers" >&5 -$as_echo_n "checking for ability to precompile headers... " >&6; } +echo "$as_me:$LINENO: checking for ability to precompile headers" >&5 +echo $ECHO_N "checking for ability to precompile headers... $ECHO_C" >&6 if test -n "$GCC"; then msg=`rm -f *h.gch; $CXX testpch.h &> /dev/null` @@ -6486,22 +5880,22 @@ _ACEOF fi fi -{ $as_echo "$as_me:$LINENO: result: ${precompile_headers}" >&5 -$as_echo "${precompile_headers}" >&6; } +echo "$as_me:$LINENO: result: ${precompile_headers}" >&5 +echo "${ECHO_T}${precompile_headers}" >&6 # End of the OS_IS_WIN section fi # Sizes of various common basic types -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" @@ -6528,35 +5922,35 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6566,34 +5960,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -6611,8 +6005,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -6635,35 +6029,35 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6673,34 +6067,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -6709,160 +6103,39 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done -done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } - fi -else - ac_cv_path_GREP=$GREP fi - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done -done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6884,32 +6157,35 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_stdc=no +ac_cv_header_stdc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -6965,7 +6241,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -6985,50 +6260,36 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - return 2; - return 0; + exit(2); + exit (0); } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -7050,11 +6311,11 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7067,42 +6328,41 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +eval "$as_ac_Header=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -7110,15 +6370,73 @@ fi done -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6 +if test "${ac_cv_type_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((int *) 0) + return 0; +if (sizeof (int)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_int=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_int=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6 + +echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6 +if test "${ac_cv_sizeof_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_int" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -7131,7 +6449,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; test_array [0] = 0 ; @@ -7139,23 +6457,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -7168,7 +6490,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; test_array [0] = 0 ; @@ -7176,43 +6498,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7222,7 +6547,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; test_array [0] = 0 ; @@ -7230,23 +6555,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -7259,7 +6588,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; test_array [0] = 0 ; @@ -7267,49 +6596,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -7323,7 +6653,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; test_array [0] = 0 ; @@ -7331,47 +6661,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; -'') if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (int) +echo "$as_me: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_int=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7380,8 +6714,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (int)); } -static unsigned long int ulongval () { return (long int) (sizeof (int)); } +long longval () { return (long) (sizeof (int)); } +unsigned long ulongval () { return (long) (sizeof (int)); } #include #include int @@ -7390,94 +6724,133 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (int))) < 0) + exit (1); + if (((long) (sizeof (int))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (int)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (int)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (int)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (int)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_int=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (int) +echo "$as_me: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_int=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_int=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6 +if test "${ac_cv_type_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((long *) 0) + return 0; +if (sizeof (long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_long=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6 + +echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_long" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -7490,7 +6863,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; test_array [0] = 0 ; @@ -7498,23 +6871,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -7527,7 +6904,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -7535,43 +6912,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7581,7 +6961,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; test_array [0] = 0 ; @@ -7589,23 +6969,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -7618,7 +7002,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -7626,49 +7010,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -7682,7 +7067,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -7690,47 +7075,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; -'') if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long) +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_long=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7739,8 +7128,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (long)); } -static unsigned long int ulongval () { return (long int) (sizeof (long)); } +long longval () { return (long) (sizeof (long)); } +unsigned long ulongval () { return (long) (sizeof (long)); } #include #include int @@ -7749,94 +7138,133 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (long))) < 0) + exit (1); + if (((long) (sizeof (long))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (long)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (long)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (long)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (long)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long) +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_long=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_long=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of void *" >&5 -$as_echo_n "checking size of void *... " >&6; } -if test "${ac_cv_sizeof_void_p+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for void *" >&5 +echo $ECHO_N "checking for void *... $ECHO_C" >&6 +if test "${ac_cv_type_void_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((void * *) 0) + return 0; +if (sizeof (void *)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_void_p=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_void_p=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 +echo "${ECHO_T}$ac_cv_type_void_p" >&6 + +echo "$as_me:$LINENO: checking size of void *" >&5 +echo $ECHO_N "checking size of void *... $ECHO_C" >&6 +if test "${ac_cv_sizeof_void_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_void_p" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -7849,7 +7277,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; test_array [0] = 0 ; @@ -7857,23 +7285,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -7886,7 +7318,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; test_array [0] = 0 ; @@ -7894,43 +7326,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7940,7 +7375,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; test_array [0] = 0 ; @@ -7948,23 +7383,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -7977,7 +7416,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; test_array [0] = 0 ; @@ -7985,49 +7424,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -8041,7 +7481,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8049,47 +7489,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_void_p=$ac_lo;; -'') if test "$ac_cv_type_void_p" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (void *) +echo "$as_me: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_void_p=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8098,8 +7542,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (void *)); } -static unsigned long int ulongval () { return (long int) (sizeof (void *)); } +long longval () { return (long) (sizeof (void *)); } +unsigned long ulongval () { return (long) (sizeof (void *)); } #include #include int @@ -8108,94 +7552,133 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (void *))) < 0) + exit (1); + if (((long) (sizeof (void *))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (void *)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (void *)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (void *)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (void *)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_void_p=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_void_p" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (void *) +echo "$as_me: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_void_p=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_void_p=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 -$as_echo "$ac_cv_sizeof_void_p" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_VOID_P $ac_cv_sizeof_void_p _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of char" >&5 -$as_echo_n "checking size of char... " >&6; } -if test "${ac_cv_sizeof_char+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for char" >&5 +echo $ECHO_N "checking for char... $ECHO_C" >&6 +if test "${ac_cv_type_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((char *) 0) + return 0; +if (sizeof (char)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_char=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_char=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 +echo "${ECHO_T}$ac_cv_type_char" >&6 + +echo "$as_me:$LINENO: checking size of char" >&5 +echo $ECHO_N "checking size of char... $ECHO_C" >&6 +if test "${ac_cv_sizeof_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_char" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -8208,7 +7691,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; test_array [0] = 0 ; @@ -8216,23 +7699,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -8245,7 +7732,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8253,43 +7740,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8299,7 +7789,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; test_array [0] = 0 ; @@ -8307,23 +7797,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -8336,7 +7830,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; test_array [0] = 0 ; @@ -8344,49 +7838,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -8400,7 +7895,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8408,47 +7903,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_char=$ac_lo;; -'') if test "$ac_cv_type_char" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (char) +echo "$as_me: error: cannot compute sizeof (char), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_char=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8457,8 +7956,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (char)); } -static unsigned long int ulongval () { return (long int) (sizeof (char)); } +long longval () { return (long) (sizeof (char)); } +unsigned long ulongval () { return (long) (sizeof (char)); } #include #include int @@ -8467,94 +7966,133 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (char))) < 0) + exit (1); + if (((long) (sizeof (char))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (char)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (char)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (char)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (char)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_char=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_char" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (char) +echo "$as_me: error: cannot compute sizeof (char), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_char=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_char=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 -$as_echo "$ac_cv_sizeof_char" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR $ac_cv_sizeof_char _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of short" >&5 -$as_echo_n "checking size of short... " >&6; } -if test "${ac_cv_sizeof_short+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6 +if test "${ac_cv_type_short+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((short *) 0) + return 0; +if (sizeof (short)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_short=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_short=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6 + +echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6 +if test "${ac_cv_sizeof_short+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_short" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -8567,7 +8105,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; test_array [0] = 0 ; @@ -8575,23 +8113,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -8604,7 +8146,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8612,43 +8154,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8658,7 +8203,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; test_array [0] = 0 ; @@ -8666,23 +8211,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -8695,7 +8244,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; test_array [0] = 0 ; @@ -8703,49 +8252,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -8759,7 +8309,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8767,47 +8317,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_short=$ac_lo;; -'') if test "$ac_cv_type_short" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (short) +echo "$as_me: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_short=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8816,8 +8370,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (short)); } -static unsigned long int ulongval () { return (long int) (sizeof (short)); } +long longval () { return (long) (sizeof (short)); } +unsigned long ulongval () { return (long) (sizeof (short)); } #include #include int @@ -8826,94 +8380,133 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (short))) < 0) + exit (1); + if (((long) (sizeof (short))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (short)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (short)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (short)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (short)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_short=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_short" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (short) +echo "$as_me: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_short=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_short=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of float" >&5 -$as_echo_n "checking size of float... " >&6; } -if test "${ac_cv_sizeof_float+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for float" >&5 +echo $ECHO_N "checking for float... $ECHO_C" >&6 +if test "${ac_cv_type_float+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((float *) 0) + return 0; +if (sizeof (float)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_float=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_float=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5 +echo "${ECHO_T}$ac_cv_type_float" >&6 + +echo "$as_me:$LINENO: checking size of float" >&5 +echo $ECHO_N "checking size of float... $ECHO_C" >&6 +if test "${ac_cv_sizeof_float+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_float" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -8926,7 +8519,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (float))) >= 0)]; test_array [0] = 0 ; @@ -8934,23 +8527,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -8963,7 +8560,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8971,43 +8568,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9017,7 +8617,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (float))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (float))) < 0)]; test_array [0] = 0 ; @@ -9025,23 +8625,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -9054,7 +8658,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (float))) >= $ac_mid)]; test_array [0] = 0 ; @@ -9062,49 +8666,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -9118,7 +8723,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)]; test_array [0] = 0 ; @@ -9126,47 +8731,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_float=$ac_lo;; -'') if test "$ac_cv_type_float" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (float) +echo "$as_me: error: cannot compute sizeof (float), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_float=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9175,8 +8784,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (float)); } -static unsigned long int ulongval () { return (long int) (sizeof (float)); } +long longval () { return (long) (sizeof (float)); } +unsigned long ulongval () { return (long) (sizeof (float)); } #include #include int @@ -9185,94 +8794,133 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (float))) < 0) + exit (1); + if (((long) (sizeof (float))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (float)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (float)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (float)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (float)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_float=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_float" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (float) +echo "$as_me: error: cannot compute sizeof (float), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_float=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_float=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5 -$as_echo "$ac_cv_sizeof_float" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5 +echo "${ECHO_T}$ac_cv_sizeof_float" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_FLOAT $ac_cv_sizeof_float _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of double" >&5 -$as_echo_n "checking size of double... " >&6; } -if test "${ac_cv_sizeof_double+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for double" >&5 +echo $ECHO_N "checking for double... $ECHO_C" >&6 +if test "${ac_cv_type_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((double *) 0) + return 0; +if (sizeof (double)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_double=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_double=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5 +echo "${ECHO_T}$ac_cv_type_double" >&6 + +echo "$as_me:$LINENO: checking size of double" >&5 +echo $ECHO_N "checking size of double... $ECHO_C" >&6 +if test "${ac_cv_sizeof_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_double" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -9285,7 +8933,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (double))) >= 0)]; test_array [0] = 0 ; @@ -9293,23 +8941,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -9322,7 +8974,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)]; test_array [0] = 0 ; @@ -9330,43 +8982,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9376,7 +9031,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (double))) < 0)]; test_array [0] = 0 ; @@ -9384,23 +9039,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -9413,7 +9072,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (double))) >= $ac_mid)]; test_array [0] = 0 ; @@ -9421,49 +9080,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -9477,7 +9137,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)]; test_array [0] = 0 ; @@ -9485,47 +9145,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_double=$ac_lo;; -'') if test "$ac_cv_type_double" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (double) +echo "$as_me: error: cannot compute sizeof (double), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_double=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9534,8 +9198,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (double)); } -static unsigned long int ulongval () { return (long int) (sizeof (double)); } +long longval () { return (long) (sizeof (double)); } +unsigned long ulongval () { return (long) (sizeof (double)); } #include #include int @@ -9544,94 +9208,133 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (double))) < 0) + exit (1); + if (((long) (sizeof (double))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (double)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (double)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (double)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (double)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_double=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_double" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (double) +echo "$as_me: error: cannot compute sizeof (double), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_double=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_double=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5 -$as_echo "$ac_cv_sizeof_double" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5 +echo "${ECHO_T}$ac_cv_sizeof_double" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_DOUBLE $ac_cv_sizeof_double _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of fpos_t" >&5 -$as_echo_n "checking size of fpos_t... " >&6; } -if test "${ac_cv_sizeof_fpos_t+set}" = set; then - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for fpos_t" >&5 +echo $ECHO_N "checking for fpos_t... $ECHO_C" >&6 +if test "${ac_cv_type_fpos_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((fpos_t *) 0) + return 0; +if (sizeof (fpos_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_fpos_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_fpos_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_fpos_t" >&5 +echo "${ECHO_T}$ac_cv_type_fpos_t" >&6 + +echo "$as_me:$LINENO: checking size of fpos_t" >&5 +echo $ECHO_N "checking size of fpos_t... $ECHO_C" >&6 +if test "${ac_cv_sizeof_fpos_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_fpos_t" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -9644,7 +9347,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (fpos_t))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (fpos_t))) >= 0)]; test_array [0] = 0 ; @@ -9652,23 +9355,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -9681,7 +9388,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (fpos_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (fpos_t))) <= $ac_mid)]; test_array [0] = 0 ; @@ -9689,43 +9396,46 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9735,7 +9445,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (fpos_t))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (fpos_t))) < 0)]; test_array [0] = 0 ; @@ -9743,23 +9453,27 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -9772,7 +9486,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (fpos_t))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (fpos_t))) >= $ac_mid)]; test_array [0] = 0 ; @@ -9780,49 +9494,50 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -9836,7 +9551,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (fpos_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (fpos_t))) <= $ac_mid)]; test_array [0] = 0 ; @@ -9844,47 +9559,51 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_fpos_t=$ac_lo;; -'') if test "$ac_cv_type_fpos_t" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (fpos_t) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (fpos_t), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (fpos_t) +echo "$as_me: error: cannot compute sizeof (fpos_t), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_fpos_t=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9893,8 +9612,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (fpos_t)); } -static unsigned long int ulongval () { return (long int) (sizeof (fpos_t)); } +long longval () { return (long) (sizeof (fpos_t)); } +unsigned long ulongval () { return (long) (sizeof (fpos_t)); } #include #include int @@ -9903,80 +9622,61 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (fpos_t))) < 0) + exit (1); + if (((long) (sizeof (fpos_t))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (fpos_t)))) - return 1; - fprintf (f, "%ld", i); + long i = longval (); + if (i != ((long) (sizeof (fpos_t)))) + exit (1); + fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (fpos_t)))) - return 1; - fprintf (f, "%lu", i); + unsigned long i = ulongval (); + if (i != ((long) (sizeof (fpos_t)))) + exit (1); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_fpos_t=`cat conftest.val` else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_fpos_t" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (fpos_t) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (fpos_t), 77 See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (fpos_t) +echo "$as_me: error: cannot compute sizeof (fpos_t), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_fpos_t=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_fpos_t=0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_fpos_t" >&5 -$as_echo "$ac_cv_sizeof_fpos_t" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_fpos_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_fpos_t" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_FPOS_T $ac_cv_sizeof_fpos_t _ACEOF @@ -10028,8 +9728,8 @@ esac has_sstream=no -{ $as_echo "$as_me:$LINENO: checking for sstream" >&5 -$as_echo_n "checking for sstream... " >&6; } +echo "$as_me:$LINENO: checking for sstream" >&5 +echo $ECHO_N "checking for sstream... $ECHO_C" >&6 cat >> testsstream.cpp << EOF #include main() {} @@ -10044,8 +9744,8 @@ _ACEOF fi rm -f testsstream.cpp -{ $as_echo "$as_me:$LINENO: result: ${has_sstream}" >&5 -$as_echo "${has_sstream}" >&6; } +echo "$as_me:$LINENO: result: ${has_sstream}" >&5 +echo "${ECHO_T}${has_sstream}" >&6 # # Determine if we have a command to strip symbols from an object file @@ -10070,14 +9770,14 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_F77+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. @@ -10088,40 +9788,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - { $as_echo "$as_me:$LINENO: result: $F77" >&5 -$as_echo "$F77" >&6; } + echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. @@ -10132,80 +9830,50 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_F77="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_F77" && break done - if test "x$ac_ct_F77" = x; then - F77="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - F77=$ac_ct_F77 - fi + F77=$ac_ct_F77 fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +echo "$as_me:9860:" \ + "checking for Fortran 77 compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } rm -f a.out @@ -10213,10 +9881,10 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 if test "${ac_cv_f77_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF program main @@ -10227,45 +9895,48 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } +echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_f77_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else FFLAGS=-g cat >conftest.$ac_ext <<_ACEOF @@ -10274,36 +9945,39 @@ cat >conftest.$ac_ext <<_ACEOF end _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_f77_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_prog_f77_g=no +ac_cv_prog_f77_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -10320,12 +9994,8 @@ else fi fi -if test $ac_compiler_gnu = yes; then - G77=yes -else - G77= -fi -ac_ext=cpp +G77=`test $ac_compiler_gnu = yes && echo yes` +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10347,10 +10017,10 @@ ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to get verbose linking output from $F77" >&5 -$as_echo_n "checking how to get verbose linking output from $F77... " >&6; } +echo "$as_me:$LINENO: checking how to get verbose linking output from $F77" >&5 +echo $ECHO_N "checking how to get verbose linking output from $F77... $ECHO_C" >&6 if test "${ac_cv_prog_f77_v+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF program main @@ -10358,23 +10028,27 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_f77_v= # Try some options frequently used verbose output for ac_verb in -v -verbose --verbose -V -\#\#\#; do @@ -10390,28 +10064,20 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_verb" -eval "set x $ac_link" -shift -$as_echo "$as_me:$LINENO: $*" >&5 -# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, -# LIBRARY_PATH; skip all such settings. -ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | - grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` -$as_echo "$ac_f77_v_output" >&5 +(eval echo $as_me:10067: \"$ac_link\") >&5 +ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` +echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS -rm -rf conftest* +rm -f conftest* # On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where # /foo, /bar, and /baz are search directories for the Fortran linker. # Here, we change these into -L/foo -L/bar -L/baz (and put it first): ac_f77_v_output="`echo $ac_f77_v_output | grep 'LPATH is:' | - sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_f77_v_output" + sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_f77_v_output" -# FIXME: we keep getting bitten by quoted arguments; a more general fix -# that detects unbalanced quotes in FLIBS should be implemented -# and (ugh) tested at some point. case $ac_f77_v_output in # If we are using xlf then replace all the commas with spaces. *xlfentry*) @@ -10420,20 +10086,13 @@ case $ac_f77_v_output in # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted # $LIBS confuse us, and the libraries appear later in the output anyway). *mGLOB_options_string*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;; - - # Portland Group compiler has singly- or doubly-quoted -cmdline argument - # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4. - # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". - *-cmdline\ * | *-ignore\ * | *-def\ *) - ac_f77_v_output=`echo $ac_f77_v_output | sed "\ - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; + ac_f77_v_output=`echo $ac_f77_v_output | sed 's/\"-mGLOB[^\"]*\"/ /g'` ;; # If we are using Cray Fortran then delete quotes. + # Use "\"" instead of '"' for font-lock-mode. + # FIXME: a more general fix for quoted arguments with spaces? *cft90*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"//g'` ;; + ac_f77_v_output=`echo $ac_f77_v_output | sed "s/\"//g"` ;; esac @@ -10447,26 +10106,25 @@ esac done done if test -z "$ac_cv_prog_f77_v"; then - { $as_echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $F77" >&5 -$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} + { echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $F77" >&5 +echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} fi else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: WARNING: compilation failed" >&5 -$as_echo "$as_me: WARNING: compilation failed" >&2;} +{ echo "$as_me:$LINENO: WARNING: compilation failed" >&5 +echo "$as_me: WARNING: compilation failed" >&2;} fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_v" >&5 -$as_echo "$ac_cv_prog_f77_v" >&6; } -{ $as_echo "$as_me:$LINENO: checking for Fortran 77 libraries of $F77" >&5 -$as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_f77_v" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_v" >&6 +echo "$as_me:$LINENO: checking for Fortran libraries of $F77" >&5 +echo $ECHO_N "checking for Fortran libraries of $F77... $ECHO_C" >&6 if test "${ac_cv_f77_libs+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "x$FLIBS" != "x"; then ac_cv_f77_libs="$FLIBS" # Let the user override the test. @@ -10484,28 +10142,20 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_cv_prog_f77_v" -eval "set x $ac_link" -shift -$as_echo "$as_me:$LINENO: $*" >&5 -# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, -# LIBRARY_PATH; skip all such settings. -ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | - grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` -$as_echo "$ac_f77_v_output" >&5 +(eval echo $as_me:10145: \"$ac_link\") >&5 +ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` +echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS -rm -rf conftest* +rm -f conftest* # On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where # /foo, /bar, and /baz are search directories for the Fortran linker. # Here, we change these into -L/foo -L/bar -L/baz (and put it first): ac_f77_v_output="`echo $ac_f77_v_output | grep 'LPATH is:' | - sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_f77_v_output" + sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_f77_v_output" -# FIXME: we keep getting bitten by quoted arguments; a more general fix -# that detects unbalanced quotes in FLIBS should be implemented -# and (ugh) tested at some point. case $ac_f77_v_output in # If we are using xlf then replace all the commas with spaces. *xlfentry*) @@ -10514,20 +10164,13 @@ case $ac_f77_v_output in # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted # $LIBS confuse us, and the libraries appear later in the output anyway). *mGLOB_options_string*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;; - - # Portland Group compiler has singly- or doubly-quoted -cmdline argument - # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4. - # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". - *-cmdline\ * | *-ignore\ * | *-def\ *) - ac_f77_v_output=`echo $ac_f77_v_output | sed "\ - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; + ac_f77_v_output=`echo $ac_f77_v_output | sed 's/\"-mGLOB[^\"]*\"/ /g'` ;; # If we are using Cray Fortran then delete quotes. + # Use "\"" instead of '"' for font-lock-mode. + # FIXME: a more general fix for quoted arguments with spaces? *cft90*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"//g'` ;; + ac_f77_v_output=`echo $ac_f77_v_output | sed "s/\"//g"` ;; esac @@ -10581,12 +10224,12 @@ fi ;; # Ignore these flags. - -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) + -lang* | -lcrt[01].o | -lcrtbegin.o | -lc | -lgcc | -libmil | -LANG:=*) ;; -lkernel32) test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" ;; - -[LRuYz]) + -[LRuY]) # These flags, when seen by themselves, take an argument. # We remove the space between option and argument and re-iterate # unless we find an empty arg or a new option (starting with -) @@ -10600,7 +10243,7 @@ fi esac ;; -YP,*) - for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do + for ac_j in `echo $ac_arg | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do ac_exists=false for ac_i in $ac_cv_f77_libs; do if test x"$ac_j" = x"$ac_i"; then @@ -10634,9 +10277,6 @@ else fi ;; - -zallextract*| -zdefaultextract) - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" - ;; # Ignore everything else. esac done @@ -10648,7 +10288,7 @@ set X $ac_save_positional; shift # must begin with a "/"). case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - ac_ld_run_path=`$as_echo "$ac_f77_v_output" | + ac_ld_run_path=`echo $ac_f77_v_output | sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` test "x$ac_ld_run_path" != x && if test "$ac_compiler_gnu" = yes; then @@ -10663,12 +10303,12 @@ esac fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_libs" >&5 -$as_echo "$ac_cv_f77_libs" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_f77_libs" >&5 +echo "${ECHO_T}$ac_cv_f77_libs" >&6 FLIBS="$ac_cv_f77_libs" -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10699,10 +10339,10 @@ if test "x${BUILD_F90}" != "x0"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_F90+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $F90 in [\\/]* | ?:[\\/]*) @@ -10715,27 +10355,26 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_F90="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi F90=$ac_cv_path_F90 -if test -n "$F90"; then - { $as_echo "$as_me:$LINENO: result: $F90" >&5 -$as_echo "$F90" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +if test -n "$F90"; then + echo "$as_me:$LINENO: result: $F90" >&5 +echo "${ECHO_T}$F90" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi test -n "$F90" && break done @@ -10757,8 +10396,8 @@ f90_module_dir='-I' f90_opts='' if test "x${BUILD_F90}" != "x0"; then - { $as_echo "$as_me:$LINENO: checking Fortran 90 compiler ($F90) type" >&5 -$as_echo_n "checking Fortran 90 compiler ($F90) type... " >&6; } + echo "$as_me:$LINENO: checking Fortran 90 compiler ($F90) type" >&5 +echo $ECHO_N "checking Fortran 90 compiler ($F90) type... $ECHO_C" >&6 cat >> testf90.f90 << EOF module mt double precision, parameter :: x = 2.3 @@ -10812,8 +10451,8 @@ F90LIBS= f90buildopts="-p. -s -YEXT_NAMES=LCS -YEXT_SFX=_ -YCFRL=1" fi rm -f testf90.f90 - { $as_echo "$as_me:$LINENO: result: ${f90type}" >&5 -$as_echo "${f90type}" >&6; } + echo "$as_me:$LINENO: result: ${f90type}" >&5 +echo "${ECHO_T}${f90type}" >&6 if test "x${BUILD_F90}" != "x0"; then if test "x${has_f90}" = "xno"; then echo " -> cannot build the Fortran 90 interface" @@ -10849,7 +10488,7 @@ if test -z "$F77_EXT"; then F77_EXT=f; fi -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10908,8 +10547,8 @@ fi # SO is the extension of shared libraries `(including the dot!) # -- usually .so, .sl on HP-UX, .dll on Cygwin -{ $as_echo "$as_me:$LINENO: checking SO" >&5 -$as_echo_n "checking SO... " >&6; } +echo "$as_me:$LINENO: checking SO" >&5 +echo $ECHO_N "checking SO... $ECHO_C" >&6 if test -z "$SO" then case $ac_sys_system in @@ -10919,12 +10558,12 @@ then *) SO=.so;; esac fi -{ $as_echo "$as_me:$LINENO: result: $SO" >&5 -$as_echo "$SO" >&6; } +echo "$as_me:$LINENO: result: $SO" >&5 +echo "${ECHO_T}$SO" >&6 -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10999,26 +10638,39 @@ fi -ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/base/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/src/kinetics/Makefile Cantera/src/numerics/Makefile Cantera/src/spectra/Makefile Cantera/src/equil/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/Makefile Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/cxx/demos/combustor/Makefile Cantera/cxx/demos/combustor/Makefile.install Cantera/cxx/demos/flamespeed/Makefile Cantera/cxx/demos/flamespeed/Makefile.install Cantera/cxx/demos/kinetics1/Makefile Cantera/cxx/demos/kinetics1/Makefile.install Cantera/cxx/demos/NASA_coeffs/Makefile Cantera/cxx/demos/NASA_coeffs/Makefile.install Cantera/cxx/demos/rankine/Makefile Cantera/cxx/demos/rankine/Makefile.install Cantera/cxx/include/Cantera.mak Cantera/cxx/include/Cantera_bt.mak Cantera/user/Makefile Cantera/python/src/Makefile Cantera/python/examples/Makefile Cantera/python/examples/equilibrium/Makefile Cantera/python/examples/equilibrium/adiabatic_flame/Makefile Cantera/python/examples/equilibrium/adiabatic_flame/runtest Cantera/python/examples/equilibrium/multiphase_plasma/Makefile Cantera/python/examples/equilibrium/multiphase_plasma/runtest Cantera/python/examples/equilibrium/simple_test/Makefile Cantera/python/examples/equilibrium/simple_test/runtest Cantera/python/examples/equilibrium/stoich_flame/Makefile Cantera/python/examples/equilibrium/stoich_flame/runtest Cantera/python/examples/gasdynamics/isentropic/Makefile Cantera/python/examples/gasdynamics/isentropic/runtest Cantera/python/examples/gasdynamics/soundSpeed/Makefile Cantera/python/examples/gasdynamics/soundSpeed/runtest Cantera/python/examples/flames/adiabatic_flame/Makefile Cantera/python/examples/flames/adiabatic_flame/runtest Cantera/python/examples/flames/flame1/Makefile Cantera/python/examples/flames/flame1/runtest Cantera/python/examples/flames/flame2/Makefile Cantera/python/examples/flames/flame2/runtest Cantera/python/examples/flames/flame_fixed_T/Makefile Cantera/python/examples/flames/flame_fixed_T/runtest Cantera/python/examples/flames/free_h2_air/Makefile Cantera/python/examples/flames/free_h2_air/runtest Cantera/python/examples/flames/npflame1/Makefile Cantera/python/examples/flames/npflame1/runtest Cantera/python/examples/flames/stflame1/Makefile Cantera/python/examples/flames/stflame1/runtest Cantera/python/examples/fuel_cells/Makefile Cantera/python/examples/fuel_cells/runtest Cantera/python/examples/liquid_vapor/critProperties/Makefile Cantera/python/examples/liquid_vapor/critProperties/runtest Cantera/python/examples/liquid_vapor/rankine/Makefile Cantera/python/examples/liquid_vapor/rankine/runtest Cantera/python/examples/kinetics/Makefile Cantera/python/examples/kinetics/runtest Cantera/python/examples/misc/Makefile Cantera/python/examples/misc/runtest Cantera/python/examples/reactors/combustor_sim/Makefile Cantera/python/examples/reactors/combustor_sim/runtest Cantera/python/examples/reactors/functors_sim/Makefile Cantera/python/examples/reactors/functors_sim/runtest Cantera/python/examples/reactors/mix1_sim/Makefile Cantera/python/examples/reactors/mix1_sim/runtest Cantera/python/examples/reactors/mix2_sim/Makefile Cantera/python/examples/reactors/mix2_sim/runtest Cantera/python/examples/reactors/piston_sim/Makefile Cantera/python/examples/reactors/piston_sim/runtest Cantera/python/examples/reactors/reactor1_sim/Makefile Cantera/python/examples/reactors/reactor1_sim/runtest Cantera/python/examples/reactors/reactor2_sim/Makefile Cantera/python/examples/reactors/reactor2_sim/runtest Cantera/python/examples/reactors/sensitivity_sim/Makefile Cantera/python/examples/reactors/sensitivity_sim/runtest Cantera/python/examples/reactors/surf_pfr_sim/Makefile Cantera/python/examples/reactors/surf_pfr_sim/runtest Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile Cantera/python/examples/surface_chemistry/diamond_cvd/runtest Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest Cantera/python/examples/transport/Makefile Cantera/python/examples/transport/runtest Cantera/python/examples/flames/Makefile Cantera/python/examples/gasdynamics/Makefile Cantera/python/examples/liquid_vapor/Makefile Cantera/python/examples/reactors/Makefile Cantera/python/examples/surface_chemistry/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/recipes/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile data/inputs/mkxml test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/spectroscopy/Makefile test_problems/surfSolverTest/Makefile test_problems/diamondSurf/Makefile test_problems/diamondSurf_dupl/Makefile test_problems/ChemEquil_gri_matrix/Makefile test_problems/ChemEquil_gri_pairs/Makefile test_problems/ChemEquil_ionizedGas/Makefile test_problems/ChemEquil_red1/Makefile test_problems/CpJump/Makefile test_problems/mixGasTransport/Makefile test_problems/multiGasTransport/Makefile test_problems/printUtilUnitTest/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/NASA9poly_test/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/nasa9_reader/Makefile test_problems/nasa9_reader/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/rankine_democxx/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/stoichSubSSTP/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile test_problems/cathermo/DH_graph_acommon/Makefile test_problems/cathermo/DH_graph_NM/Makefile test_problems/cathermo/DH_graph_Pitzer/Makefile test_problems/cathermo/DH_graph_bdotak/Makefile test_problems/cathermo/HMW_dupl_test/Makefile test_problems/cathermo/VPissp/Makefile test_problems/VCSnonideal/Makefile test_problems/VPsilane_test/Makefile test_problems/VPsilane_test/runtest test_problems/VCSnonideal/NaCl_equil/Makefile bin/install_tsc" - + ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/base/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/src/kinetics/Makefile Cantera/src/numerics/Makefile Cantera/src/spectra/Makefile Cantera/src/equil/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/Makefile Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/cxx/demos/combustor/Makefile Cantera/cxx/demos/combustor/Makefile.install Cantera/cxx/demos/flamespeed/Makefile Cantera/cxx/demos/flamespeed/Makefile.install Cantera/cxx/demos/kinetics1/Makefile Cantera/cxx/demos/kinetics1/Makefile.install Cantera/cxx/demos/NASA_coeffs/Makefile Cantera/cxx/demos/NASA_coeffs/Makefile.install Cantera/cxx/demos/rankine/Makefile Cantera/cxx/demos/rankine/Makefile.install Cantera/cxx/include/Cantera.mak Cantera/cxx/include/Cantera_bt.mak Cantera/user/Makefile Cantera/python/src/Makefile Cantera/python/examples/Makefile Cantera/python/examples/equilibrium/Makefile Cantera/python/examples/equilibrium/adiabatic_flame/Makefile Cantera/python/examples/equilibrium/adiabatic_flame/runtest Cantera/python/examples/equilibrium/multiphase_plasma/Makefile Cantera/python/examples/equilibrium/multiphase_plasma/runtest Cantera/python/examples/equilibrium/simple_test/Makefile Cantera/python/examples/equilibrium/simple_test/runtest Cantera/python/examples/equilibrium/stoich_flame/Makefile Cantera/python/examples/equilibrium/stoich_flame/runtest Cantera/python/examples/gasdynamics/isentropic/Makefile Cantera/python/examples/gasdynamics/isentropic/runtest Cantera/python/examples/gasdynamics/soundSpeed/Makefile Cantera/python/examples/gasdynamics/soundSpeed/runtest Cantera/python/examples/flames/adiabatic_flame/Makefile Cantera/python/examples/flames/adiabatic_flame/runtest Cantera/python/examples/flames/flame1/Makefile Cantera/python/examples/flames/flame1/runtest Cantera/python/examples/flames/flame2/Makefile Cantera/python/examples/flames/flame2/runtest Cantera/python/examples/flames/flame_fixed_T/Makefile Cantera/python/examples/flames/flame_fixed_T/runtest Cantera/python/examples/flames/free_h2_air/Makefile Cantera/python/examples/flames/free_h2_air/runtest Cantera/python/examples/flames/npflame1/Makefile Cantera/python/examples/flames/npflame1/runtest Cantera/python/examples/flames/stflame1/Makefile Cantera/python/examples/flames/stflame1/runtest Cantera/python/examples/fuel_cells/Makefile Cantera/python/examples/fuel_cells/runtest Cantera/python/examples/liquid_vapor/critProperties/Makefile Cantera/python/examples/liquid_vapor/critProperties/runtest Cantera/python/examples/liquid_vapor/rankine/Makefile Cantera/python/examples/liquid_vapor/rankine/runtest Cantera/python/examples/kinetics/Makefile Cantera/python/examples/kinetics/runtest Cantera/python/examples/misc/Makefile Cantera/python/examples/misc/runtest Cantera/python/examples/reactors/combustor_sim/Makefile Cantera/python/examples/reactors/combustor_sim/runtest Cantera/python/examples/reactors/functors_sim/Makefile Cantera/python/examples/reactors/functors_sim/runtest Cantera/python/examples/reactors/mix1_sim/Makefile Cantera/python/examples/reactors/mix1_sim/runtest Cantera/python/examples/reactors/mix2_sim/Makefile Cantera/python/examples/reactors/mix2_sim/runtest Cantera/python/examples/reactors/piston_sim/Makefile Cantera/python/examples/reactors/piston_sim/runtest Cantera/python/examples/reactors/reactor1_sim/Makefile Cantera/python/examples/reactors/reactor1_sim/runtest Cantera/python/examples/reactors/reactor2_sim/Makefile Cantera/python/examples/reactors/reactor2_sim/runtest Cantera/python/examples/reactors/sensitivity_sim/Makefile Cantera/python/examples/reactors/sensitivity_sim/runtest Cantera/python/examples/reactors/surf_pfr_sim/Makefile Cantera/python/examples/reactors/surf_pfr_sim/runtest Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile Cantera/python/examples/surface_chemistry/diamond_cvd/runtest Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest Cantera/python/examples/transport/Makefile Cantera/python/examples/transport/runtest Cantera/python/examples/flames/Makefile Cantera/python/examples/gasdynamics/Makefile Cantera/python/examples/liquid_vapor/Makefile Cantera/python/examples/reactors/Makefile Cantera/python/examples/surface_chemistry/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/recipes/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile data/inputs/mkxml test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/spectroscopy/Makefile test_problems/surfSolverTest/Makefile test_problems/diamondSurf/Makefile test_problems/diamondSurf_dupl/Makefile test_problems/ChemEquil_gri_matrix/Makefile test_problems/ChemEquil_gri_pairs/Makefile test_problems/ChemEquil_ionizedGas/Makefile test_problems/ChemEquil_red1/Makefile test_problems/CpJump/Makefile test_problems/mixGasTransport/Makefile test_problems/multiGasTransport/Makefile test_problems/printUtilUnitTest/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/NASA9poly_test/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/nasa9_reader/Makefile test_problems/nasa9_reader/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/pureFluidTest/Makefile test_problems/rankine_democxx/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/stoichSubSSTP/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile test_problems/cathermo/DH_graph_acommon/Makefile test_problems/cathermo/DH_graph_NM/Makefile test_problems/cathermo/DH_graph_Pitzer/Makefile test_problems/cathermo/DH_graph_bdotak/Makefile test_problems/cathermo/HMW_dupl_test/Makefile test_problems/cathermo/VPissp/Makefile test_problems/VCSnonideal/Makefile test_problems/VPsilane_test/Makefile test_problems/VPsilane_test/runtest test_problems/VCSnonideal/NaCl_equil/Makefile bin/install_tsc" test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' +fi + DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -11027,12 +10679,11 @@ LTLIBOBJS=$ac_ltlibobjs : ${CONFIG_STATUS=./config.status} -ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -11045,78 +10696,22 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -11126,60 +10721,33 @@ else fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - # Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done +$as_unset ENV MAIL MAILPATH PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -11187,122 +10755,159 @@ fi # Name of the executable. -as_me=`$as_basename -- "$0" || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` -# CDPATH. -$as_unset CDPATH +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi as_lineno_1=$LINENO as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, t loop - s/-\n.*// + s,-$,, + s,^['$as_cr_digits']*\n,, ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno # Exit status is that of the last command. exit } -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then + +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links as_ln_s='cp -p' + else + as_ln_s='ln -s' fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -11311,28 +10916,7 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -11341,14 +10925,31 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + exec 6>&1 -# Save the log message, to keep $[0] and so on meaningful, and to +# Open the log real soon, to keep \$[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + This file was extended by Cantera $as_me 1.7.0, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -11356,44 +10957,45 @@ generated by GNU Autoconf 2.63. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi -_ACEOF +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi + +cat >>$CONFIG_STATUS <<\_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet, --silent - do not print progress messages + -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -11402,82 +11004,83 @@ Configuration headers: $config_headers Report bugs to ." - _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ Cantera config.status 1.7.0 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.59, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -test -n "\$AWK" || AWK=awk +srcdir=$srcdir +INSTALL="$INSTALL" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. ac_need_defaults=: while test $# != 0 do case $1 in --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ac_shift=: ;; - *) + -*) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_option=$1 + ac_need_defaults=false;; esac case $ac_option in # Handling of the options. +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:$LINENO: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; + *) ac_config_targets="$ac_config_targets $1" ;; esac shift @@ -11491,234 +11094,218 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Handling of arguments. + + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "Cantera/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/Makefile" ;; - "Cantera/src/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/Makefile" ;; - "Cantera/src/base/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/base/Makefile" ;; - "Cantera/src/zeroD/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/zeroD/Makefile" ;; - "Cantera/src/oneD/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/oneD/Makefile" ;; - "Cantera/src/converters/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/converters/Makefile" ;; - "Cantera/src/transport/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/transport/Makefile" ;; - "Cantera/src/thermo/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/thermo/Makefile" ;; - "Cantera/src/kinetics/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/kinetics/Makefile" ;; - "Cantera/src/numerics/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/numerics/Makefile" ;; - "Cantera/src/spectra/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/spectra/Makefile" ;; - "Cantera/src/equil/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/src/equil/Makefile" ;; - "Cantera/clib/src/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/clib/src/Makefile" ;; - "Cantera/fortran/src/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/fortran/src/Makefile" ;; - "Cantera/fortran/f77demos/f77demos.mak") CONFIG_FILES="$CONFIG_FILES Cantera/fortran/f77demos/f77demos.mak" ;; - "Cantera/fortran/f77demos/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/fortran/f77demos/Makefile" ;; - "Cantera/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/matlab/Makefile" ;; - "Cantera/matlab/setup_matlab.py") CONFIG_FILES="$CONFIG_FILES Cantera/matlab/setup_matlab.py" ;; - "Cantera/python/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/Makefile" ;; - "Cantera/python/setup.py") CONFIG_FILES="$CONFIG_FILES Cantera/python/setup.py" ;; - "Cantera/cxx/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/Makefile" ;; - "Cantera/cxx/src/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/src/Makefile" ;; - "Cantera/cxx/demos/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/Makefile" ;; - "Cantera/cxx/demos/combustor/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/combustor/Makefile" ;; - "Cantera/cxx/demos/combustor/Makefile.install") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/combustor/Makefile.install" ;; - "Cantera/cxx/demos/flamespeed/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/flamespeed/Makefile" ;; - "Cantera/cxx/demos/flamespeed/Makefile.install") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/flamespeed/Makefile.install" ;; - "Cantera/cxx/demos/kinetics1/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/kinetics1/Makefile" ;; - "Cantera/cxx/demos/kinetics1/Makefile.install") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/kinetics1/Makefile.install" ;; - "Cantera/cxx/demos/NASA_coeffs/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/NASA_coeffs/Makefile" ;; - "Cantera/cxx/demos/NASA_coeffs/Makefile.install") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/NASA_coeffs/Makefile.install" ;; - "Cantera/cxx/demos/rankine/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/rankine/Makefile" ;; - "Cantera/cxx/demos/rankine/Makefile.install") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/rankine/Makefile.install" ;; - "Cantera/cxx/include/Cantera.mak") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/include/Cantera.mak" ;; - "Cantera/cxx/include/Cantera_bt.mak") CONFIG_FILES="$CONFIG_FILES Cantera/cxx/include/Cantera_bt.mak" ;; - "Cantera/user/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/user/Makefile" ;; - "Cantera/python/src/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/src/Makefile" ;; - "Cantera/python/examples/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/Makefile" ;; - "Cantera/python/examples/equilibrium/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/Makefile" ;; - "Cantera/python/examples/equilibrium/adiabatic_flame/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/adiabatic_flame/Makefile" ;; - "Cantera/python/examples/equilibrium/adiabatic_flame/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/adiabatic_flame/runtest" ;; - "Cantera/python/examples/equilibrium/multiphase_plasma/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/multiphase_plasma/Makefile" ;; - "Cantera/python/examples/equilibrium/multiphase_plasma/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/multiphase_plasma/runtest" ;; - "Cantera/python/examples/equilibrium/simple_test/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/simple_test/Makefile" ;; - "Cantera/python/examples/equilibrium/simple_test/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/simple_test/runtest" ;; - "Cantera/python/examples/equilibrium/stoich_flame/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/stoich_flame/Makefile" ;; - "Cantera/python/examples/equilibrium/stoich_flame/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/stoich_flame/runtest" ;; - "Cantera/python/examples/gasdynamics/isentropic/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/isentropic/Makefile" ;; - "Cantera/python/examples/gasdynamics/isentropic/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/isentropic/runtest" ;; - "Cantera/python/examples/gasdynamics/soundSpeed/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/soundSpeed/Makefile" ;; - "Cantera/python/examples/gasdynamics/soundSpeed/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/soundSpeed/runtest" ;; - "Cantera/python/examples/flames/adiabatic_flame/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/adiabatic_flame/Makefile" ;; - "Cantera/python/examples/flames/adiabatic_flame/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/adiabatic_flame/runtest" ;; - "Cantera/python/examples/flames/flame1/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame1/Makefile" ;; - "Cantera/python/examples/flames/flame1/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame1/runtest" ;; - "Cantera/python/examples/flames/flame2/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame2/Makefile" ;; - "Cantera/python/examples/flames/flame2/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame2/runtest" ;; - "Cantera/python/examples/flames/flame_fixed_T/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame_fixed_T/Makefile" ;; - "Cantera/python/examples/flames/flame_fixed_T/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame_fixed_T/runtest" ;; - "Cantera/python/examples/flames/free_h2_air/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/free_h2_air/Makefile" ;; - "Cantera/python/examples/flames/free_h2_air/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/free_h2_air/runtest" ;; - "Cantera/python/examples/flames/npflame1/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/npflame1/Makefile" ;; - "Cantera/python/examples/flames/npflame1/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/npflame1/runtest" ;; - "Cantera/python/examples/flames/stflame1/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/stflame1/Makefile" ;; - "Cantera/python/examples/flames/stflame1/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/stflame1/runtest" ;; - "Cantera/python/examples/fuel_cells/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/fuel_cells/Makefile" ;; - "Cantera/python/examples/fuel_cells/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/fuel_cells/runtest" ;; - "Cantera/python/examples/liquid_vapor/critProperties/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/critProperties/Makefile" ;; - "Cantera/python/examples/liquid_vapor/critProperties/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/critProperties/runtest" ;; - "Cantera/python/examples/liquid_vapor/rankine/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/rankine/Makefile" ;; - "Cantera/python/examples/liquid_vapor/rankine/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/rankine/runtest" ;; - "Cantera/python/examples/kinetics/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/kinetics/Makefile" ;; - "Cantera/python/examples/kinetics/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/kinetics/runtest" ;; - "Cantera/python/examples/misc/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/misc/Makefile" ;; - "Cantera/python/examples/misc/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/misc/runtest" ;; - "Cantera/python/examples/reactors/combustor_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/combustor_sim/Makefile" ;; - "Cantera/python/examples/reactors/combustor_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/combustor_sim/runtest" ;; - "Cantera/python/examples/reactors/functors_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/functors_sim/Makefile" ;; - "Cantera/python/examples/reactors/functors_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/functors_sim/runtest" ;; - "Cantera/python/examples/reactors/mix1_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix1_sim/Makefile" ;; - "Cantera/python/examples/reactors/mix1_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix1_sim/runtest" ;; - "Cantera/python/examples/reactors/mix2_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix2_sim/Makefile" ;; - "Cantera/python/examples/reactors/mix2_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix2_sim/runtest" ;; - "Cantera/python/examples/reactors/piston_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/piston_sim/Makefile" ;; - "Cantera/python/examples/reactors/piston_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/piston_sim/runtest" ;; - "Cantera/python/examples/reactors/reactor1_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor1_sim/Makefile" ;; - "Cantera/python/examples/reactors/reactor1_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor1_sim/runtest" ;; - "Cantera/python/examples/reactors/reactor2_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor2_sim/Makefile" ;; - "Cantera/python/examples/reactors/reactor2_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor2_sim/runtest" ;; - "Cantera/python/examples/reactors/sensitivity_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/sensitivity_sim/Makefile" ;; - "Cantera/python/examples/reactors/sensitivity_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/sensitivity_sim/runtest" ;; - "Cantera/python/examples/reactors/surf_pfr_sim/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/surf_pfr_sim/Makefile" ;; - "Cantera/python/examples/reactors/surf_pfr_sim/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/surf_pfr_sim/runtest" ;; - "Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile" ;; - "Cantera/python/examples/surface_chemistry/diamond_cvd/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/diamond_cvd/runtest" ;; - "Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile" ;; - "Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest" ;; - "Cantera/python/examples/transport/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/transport/Makefile" ;; - "Cantera/python/examples/transport/runtest") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/transport/runtest" ;; - "Cantera/python/examples/flames/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/Makefile" ;; - "Cantera/python/examples/gasdynamics/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/Makefile" ;; - "Cantera/python/examples/liquid_vapor/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/Makefile" ;; - "Cantera/python/examples/reactors/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/Makefile" ;; - "Cantera/python/examples/surface_chemistry/Makefile") CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/Makefile" ;; - "ext/lapack/Makefile") CONFIG_FILES="$CONFIG_FILES ext/lapack/Makefile" ;; - "ext/blas/Makefile") CONFIG_FILES="$CONFIG_FILES ext/blas/Makefile" ;; - "ext/cvode/Makefile") CONFIG_FILES="$CONFIG_FILES ext/cvode/Makefile" ;; - "ext/math/Makefile") CONFIG_FILES="$CONFIG_FILES ext/math/Makefile" ;; - "ext/recipes/Makefile") CONFIG_FILES="$CONFIG_FILES ext/recipes/Makefile" ;; - "ext/tpx/Makefile") CONFIG_FILES="$CONFIG_FILES ext/tpx/Makefile" ;; - "ext/Makefile") CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;; - "ext/f2c_libs/Makefile") CONFIG_FILES="$CONFIG_FILES ext/f2c_libs/Makefile" ;; - "ext/f2c_blas/Makefile") CONFIG_FILES="$CONFIG_FILES ext/f2c_blas/Makefile" ;; - "ext/f2c_lapack/Makefile") CONFIG_FILES="$CONFIG_FILES ext/f2c_lapack/Makefile" ;; - "ext/f2c_math/Makefile") CONFIG_FILES="$CONFIG_FILES ext/f2c_math/Makefile" ;; - "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "examples/cxx/Makefile") CONFIG_FILES="$CONFIG_FILES examples/cxx/Makefile" ;; - "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "tools/doc/Cantera.cfg") CONFIG_FILES="$CONFIG_FILES tools/doc/Cantera.cfg" ;; - "tools/doc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/doc/Makefile" ;; - "tools/src/Makefile") CONFIG_FILES="$CONFIG_FILES tools/src/Makefile" ;; - "tools/src/sample.mak") CONFIG_FILES="$CONFIG_FILES tools/src/sample.mak" ;; - "tools/src/finish_install.py") CONFIG_FILES="$CONFIG_FILES tools/src/finish_install.py" ;; - "tools/src/package4mac") CONFIG_FILES="$CONFIG_FILES tools/src/package4mac" ;; - "tools/templates/f77/demo.mak") CONFIG_FILES="$CONFIG_FILES tools/templates/f77/demo.mak" ;; - "tools/templates/f90/demo.mak") CONFIG_FILES="$CONFIG_FILES tools/templates/f90/demo.mak" ;; - "tools/templates/cxx/demo.mak") CONFIG_FILES="$CONFIG_FILES tools/templates/cxx/demo.mak" ;; - "tools/testtools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/testtools/Makefile" ;; - "data/inputs/Makefile") CONFIG_FILES="$CONFIG_FILES data/inputs/Makefile" ;; - "data/inputs/mkxml") CONFIG_FILES="$CONFIG_FILES data/inputs/mkxml" ;; - "test_problems/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/Makefile" ;; - "test_problems/cxx_ex/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cxx_ex/Makefile" ;; - "test_problems/silane_equil/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/silane_equil/Makefile" ;; - "test_problems/surfkin/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/surfkin/Makefile" ;; - "test_problems/spectroscopy/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/spectroscopy/Makefile" ;; - "test_problems/surfSolverTest/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/surfSolverTest/Makefile" ;; - "test_problems/diamondSurf/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/diamondSurf/Makefile" ;; - "test_problems/diamondSurf_dupl/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/diamondSurf_dupl/Makefile" ;; - "test_problems/ChemEquil_gri_matrix/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_gri_matrix/Makefile" ;; - "test_problems/ChemEquil_gri_pairs/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_gri_pairs/Makefile" ;; - "test_problems/ChemEquil_ionizedGas/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_ionizedGas/Makefile" ;; - "test_problems/ChemEquil_red1/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_red1/Makefile" ;; - "test_problems/CpJump/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/CpJump/Makefile" ;; - "test_problems/mixGasTransport/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/mixGasTransport/Makefile" ;; - "test_problems/multiGasTransport/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/multiGasTransport/Makefile" ;; - "test_problems/printUtilUnitTest/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/printUtilUnitTest/Makefile" ;; - "test_problems/fracCoeff/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/fracCoeff/Makefile" ;; - "test_problems/negATest/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/negATest/Makefile" ;; - "test_problems/NASA9poly_test/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/NASA9poly_test/Makefile" ;; - "test_problems/ck2cti_test/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/ck2cti_test/Makefile" ;; - "test_problems/ck2cti_test/runtest") CONFIG_FILES="$CONFIG_FILES test_problems/ck2cti_test/runtest" ;; - "test_problems/nasa9_reader/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/nasa9_reader/Makefile" ;; - "test_problems/nasa9_reader/runtest") CONFIG_FILES="$CONFIG_FILES test_problems/nasa9_reader/runtest" ;; - "test_problems/min_python/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/min_python/Makefile" ;; - "test_problems/min_python/minDiamond/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/min_python/minDiamond/Makefile" ;; - "test_problems/min_python/negATest/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/min_python/negATest/Makefile" ;; - "test_problems/pureFluidTest/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/pureFluidTest/Makefile" ;; - "test_problems/rankine_democxx/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/rankine_democxx/Makefile" ;; - "test_problems/python/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/python/Makefile" ;; - "test_problems/cathermo/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/Makefile" ;; - "test_problems/cathermo/issp/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/issp/Makefile" ;; - "test_problems/cathermo/ims/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/ims/Makefile" ;; - "test_problems/cathermo/stoichSubSSTP/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/stoichSubSSTP/Makefile" ;; - "test_problems/cathermo/testIAPWS/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testIAPWS/Makefile" ;; - "test_problems/cathermo/testIAPWSPres/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testIAPWSPres/Makefile" ;; - "test_problems/cathermo/testIAPWSTripP/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testIAPWSTripP/Makefile" ;; - "test_problems/cathermo/testWaterPDSS/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testWaterPDSS/Makefile" ;; - "test_problems/cathermo/testWaterTP/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testWaterTP/Makefile" ;; - "test_problems/cathermo/HMW_test_1/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_test_1/Makefile" ;; - "test_problems/cathermo/HMW_test_3/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_test_3/Makefile" ;; - "test_problems/cathermo/HMW_graph_GvT/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_GvT/Makefile" ;; - "test_problems/cathermo/HMW_graph_GvI/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_GvI/Makefile" ;; - "test_problems/cathermo/HMW_graph_HvT/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_HvT/Makefile" ;; - "test_problems/cathermo/HMW_graph_CpvT/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_CpvT/Makefile" ;; - "test_problems/cathermo/HMW_graph_VvT/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_VvT/Makefile" ;; - "test_problems/cathermo/DH_graph_1/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_1/Makefile" ;; - "test_problems/cathermo/DH_graph_acommon/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_acommon/Makefile" ;; - "test_problems/cathermo/DH_graph_NM/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_NM/Makefile" ;; - "test_problems/cathermo/DH_graph_Pitzer/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_Pitzer/Makefile" ;; - "test_problems/cathermo/DH_graph_bdotak/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_bdotak/Makefile" ;; - "test_problems/cathermo/HMW_dupl_test/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_dupl_test/Makefile" ;; - "test_problems/cathermo/VPissp/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/VPissp/Makefile" ;; - "test_problems/VCSnonideal/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/VCSnonideal/Makefile" ;; - "test_problems/VPsilane_test/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/VPsilane_test/Makefile" ;; - "test_problems/VPsilane_test/runtest") CONFIG_FILES="$CONFIG_FILES test_problems/VPsilane_test/runtest" ;; - "test_problems/VCSnonideal/NaCl_equil/Makefile") CONFIG_FILES="$CONFIG_FILES test_problems/VCSnonideal/NaCl_equil/Makefile" ;; - "bin/install_tsc") CONFIG_FILES="$CONFIG_FILES bin/install_tsc" ;; - - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + case "$ac_config_target" in + # Handling of arguments. + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "Cantera/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/Makefile" ;; + "Cantera/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/Makefile" ;; + "Cantera/src/base/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/base/Makefile" ;; + "Cantera/src/zeroD/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/zeroD/Makefile" ;; + "Cantera/src/oneD/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/oneD/Makefile" ;; + "Cantera/src/converters/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/converters/Makefile" ;; + "Cantera/src/transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/transport/Makefile" ;; + "Cantera/src/thermo/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/thermo/Makefile" ;; + "Cantera/src/kinetics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/kinetics/Makefile" ;; + "Cantera/src/numerics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/numerics/Makefile" ;; + "Cantera/src/spectra/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/spectra/Makefile" ;; + "Cantera/src/equil/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/src/equil/Makefile" ;; + "Cantera/clib/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/clib/src/Makefile" ;; + "Cantera/fortran/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/fortran/src/Makefile" ;; + "Cantera/fortran/f77demos/f77demos.mak" ) CONFIG_FILES="$CONFIG_FILES Cantera/fortran/f77demos/f77demos.mak" ;; + "Cantera/fortran/f77demos/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/fortran/f77demos/Makefile" ;; + "Cantera/matlab/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/matlab/Makefile" ;; + "Cantera/matlab/setup_matlab.py" ) CONFIG_FILES="$CONFIG_FILES Cantera/matlab/setup_matlab.py" ;; + "Cantera/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/Makefile" ;; + "Cantera/python/setup.py" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/setup.py" ;; + "Cantera/cxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/Makefile" ;; + "Cantera/cxx/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/src/Makefile" ;; + "Cantera/cxx/demos/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/Makefile" ;; + "Cantera/cxx/demos/combustor/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/combustor/Makefile" ;; + "Cantera/cxx/demos/combustor/Makefile.install" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/combustor/Makefile.install" ;; + "Cantera/cxx/demos/flamespeed/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/flamespeed/Makefile" ;; + "Cantera/cxx/demos/flamespeed/Makefile.install" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/flamespeed/Makefile.install" ;; + "Cantera/cxx/demos/kinetics1/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/kinetics1/Makefile" ;; + "Cantera/cxx/demos/kinetics1/Makefile.install" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/kinetics1/Makefile.install" ;; + "Cantera/cxx/demos/NASA_coeffs/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/NASA_coeffs/Makefile" ;; + "Cantera/cxx/demos/NASA_coeffs/Makefile.install" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/NASA_coeffs/Makefile.install" ;; + "Cantera/cxx/demos/rankine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/rankine/Makefile" ;; + "Cantera/cxx/demos/rankine/Makefile.install" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/demos/rankine/Makefile.install" ;; + "Cantera/cxx/include/Cantera.mak" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/include/Cantera.mak" ;; + "Cantera/cxx/include/Cantera_bt.mak" ) CONFIG_FILES="$CONFIG_FILES Cantera/cxx/include/Cantera_bt.mak" ;; + "Cantera/user/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/user/Makefile" ;; + "Cantera/python/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/src/Makefile" ;; + "Cantera/python/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/Makefile" ;; + "Cantera/python/examples/equilibrium/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/Makefile" ;; + "Cantera/python/examples/equilibrium/adiabatic_flame/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/adiabatic_flame/Makefile" ;; + "Cantera/python/examples/equilibrium/adiabatic_flame/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/adiabatic_flame/runtest" ;; + "Cantera/python/examples/equilibrium/multiphase_plasma/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/multiphase_plasma/Makefile" ;; + "Cantera/python/examples/equilibrium/multiphase_plasma/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/multiphase_plasma/runtest" ;; + "Cantera/python/examples/equilibrium/simple_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/simple_test/Makefile" ;; + "Cantera/python/examples/equilibrium/simple_test/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/simple_test/runtest" ;; + "Cantera/python/examples/equilibrium/stoich_flame/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/stoich_flame/Makefile" ;; + "Cantera/python/examples/equilibrium/stoich_flame/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/equilibrium/stoich_flame/runtest" ;; + "Cantera/python/examples/gasdynamics/isentropic/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/isentropic/Makefile" ;; + "Cantera/python/examples/gasdynamics/isentropic/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/isentropic/runtest" ;; + "Cantera/python/examples/gasdynamics/soundSpeed/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/soundSpeed/Makefile" ;; + "Cantera/python/examples/gasdynamics/soundSpeed/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/soundSpeed/runtest" ;; + "Cantera/python/examples/flames/adiabatic_flame/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/adiabatic_flame/Makefile" ;; + "Cantera/python/examples/flames/adiabatic_flame/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/adiabatic_flame/runtest" ;; + "Cantera/python/examples/flames/flame1/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame1/Makefile" ;; + "Cantera/python/examples/flames/flame1/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame1/runtest" ;; + "Cantera/python/examples/flames/flame2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame2/Makefile" ;; + "Cantera/python/examples/flames/flame2/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame2/runtest" ;; + "Cantera/python/examples/flames/flame_fixed_T/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame_fixed_T/Makefile" ;; + "Cantera/python/examples/flames/flame_fixed_T/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/flame_fixed_T/runtest" ;; + "Cantera/python/examples/flames/free_h2_air/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/free_h2_air/Makefile" ;; + "Cantera/python/examples/flames/free_h2_air/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/free_h2_air/runtest" ;; + "Cantera/python/examples/flames/npflame1/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/npflame1/Makefile" ;; + "Cantera/python/examples/flames/npflame1/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/npflame1/runtest" ;; + "Cantera/python/examples/flames/stflame1/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/stflame1/Makefile" ;; + "Cantera/python/examples/flames/stflame1/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/stflame1/runtest" ;; + "Cantera/python/examples/fuel_cells/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/fuel_cells/Makefile" ;; + "Cantera/python/examples/fuel_cells/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/fuel_cells/runtest" ;; + "Cantera/python/examples/liquid_vapor/critProperties/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/critProperties/Makefile" ;; + "Cantera/python/examples/liquid_vapor/critProperties/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/critProperties/runtest" ;; + "Cantera/python/examples/liquid_vapor/rankine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/rankine/Makefile" ;; + "Cantera/python/examples/liquid_vapor/rankine/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/rankine/runtest" ;; + "Cantera/python/examples/kinetics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/kinetics/Makefile" ;; + "Cantera/python/examples/kinetics/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/kinetics/runtest" ;; + "Cantera/python/examples/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/misc/Makefile" ;; + "Cantera/python/examples/misc/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/misc/runtest" ;; + "Cantera/python/examples/reactors/combustor_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/combustor_sim/Makefile" ;; + "Cantera/python/examples/reactors/combustor_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/combustor_sim/runtest" ;; + "Cantera/python/examples/reactors/functors_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/functors_sim/Makefile" ;; + "Cantera/python/examples/reactors/functors_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/functors_sim/runtest" ;; + "Cantera/python/examples/reactors/mix1_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix1_sim/Makefile" ;; + "Cantera/python/examples/reactors/mix1_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix1_sim/runtest" ;; + "Cantera/python/examples/reactors/mix2_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix2_sim/Makefile" ;; + "Cantera/python/examples/reactors/mix2_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/mix2_sim/runtest" ;; + "Cantera/python/examples/reactors/piston_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/piston_sim/Makefile" ;; + "Cantera/python/examples/reactors/piston_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/piston_sim/runtest" ;; + "Cantera/python/examples/reactors/reactor1_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor1_sim/Makefile" ;; + "Cantera/python/examples/reactors/reactor1_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor1_sim/runtest" ;; + "Cantera/python/examples/reactors/reactor2_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor2_sim/Makefile" ;; + "Cantera/python/examples/reactors/reactor2_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/reactor2_sim/runtest" ;; + "Cantera/python/examples/reactors/sensitivity_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/sensitivity_sim/Makefile" ;; + "Cantera/python/examples/reactors/sensitivity_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/sensitivity_sim/runtest" ;; + "Cantera/python/examples/reactors/surf_pfr_sim/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/surf_pfr_sim/Makefile" ;; + "Cantera/python/examples/reactors/surf_pfr_sim/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/surf_pfr_sim/runtest" ;; + "Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/diamond_cvd/Makefile" ;; + "Cantera/python/examples/surface_chemistry/diamond_cvd/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/diamond_cvd/runtest" ;; + "Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/catcomb_stagflow/Makefile" ;; + "Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest" ;; + "Cantera/python/examples/transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/transport/Makefile" ;; + "Cantera/python/examples/transport/runtest" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/transport/runtest" ;; + "Cantera/python/examples/flames/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/flames/Makefile" ;; + "Cantera/python/examples/gasdynamics/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/gasdynamics/Makefile" ;; + "Cantera/python/examples/liquid_vapor/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/liquid_vapor/Makefile" ;; + "Cantera/python/examples/reactors/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/reactors/Makefile" ;; + "Cantera/python/examples/surface_chemistry/Makefile" ) CONFIG_FILES="$CONFIG_FILES Cantera/python/examples/surface_chemistry/Makefile" ;; + "ext/lapack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/lapack/Makefile" ;; + "ext/blas/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/blas/Makefile" ;; + "ext/cvode/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/cvode/Makefile" ;; + "ext/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/math/Makefile" ;; + "ext/recipes/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/recipes/Makefile" ;; + "ext/tpx/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/tpx/Makefile" ;; + "ext/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;; + "ext/f2c_libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_libs/Makefile" ;; + "ext/f2c_blas/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_blas/Makefile" ;; + "ext/f2c_lapack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_lapack/Makefile" ;; + "ext/f2c_math/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_math/Makefile" ;; + "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "examples/cxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/cxx/Makefile" ;; + "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "tools/doc/Cantera.cfg" ) CONFIG_FILES="$CONFIG_FILES tools/doc/Cantera.cfg" ;; + "tools/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/doc/Makefile" ;; + "tools/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/src/Makefile" ;; + "tools/src/sample.mak" ) CONFIG_FILES="$CONFIG_FILES tools/src/sample.mak" ;; + "tools/src/finish_install.py" ) CONFIG_FILES="$CONFIG_FILES tools/src/finish_install.py" ;; + "tools/src/package4mac" ) CONFIG_FILES="$CONFIG_FILES tools/src/package4mac" ;; + "tools/templates/f77/demo.mak" ) CONFIG_FILES="$CONFIG_FILES tools/templates/f77/demo.mak" ;; + "tools/templates/f90/demo.mak" ) CONFIG_FILES="$CONFIG_FILES tools/templates/f90/demo.mak" ;; + "tools/templates/cxx/demo.mak" ) CONFIG_FILES="$CONFIG_FILES tools/templates/cxx/demo.mak" ;; + "tools/testtools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/testtools/Makefile" ;; + "data/inputs/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/inputs/Makefile" ;; + "data/inputs/mkxml" ) CONFIG_FILES="$CONFIG_FILES data/inputs/mkxml" ;; + "test_problems/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/Makefile" ;; + "test_problems/cxx_ex/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cxx_ex/Makefile" ;; + "test_problems/silane_equil/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/silane_equil/Makefile" ;; + "test_problems/surfkin/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/surfkin/Makefile" ;; + "test_problems/spectroscopy/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/spectroscopy/Makefile" ;; + "test_problems/surfSolverTest/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/surfSolverTest/Makefile" ;; + "test_problems/diamondSurf/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/diamondSurf/Makefile" ;; + "test_problems/diamondSurf_dupl/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/diamondSurf_dupl/Makefile" ;; + "test_problems/ChemEquil_gri_matrix/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_gri_matrix/Makefile" ;; + "test_problems/ChemEquil_gri_pairs/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_gri_pairs/Makefile" ;; + "test_problems/ChemEquil_ionizedGas/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_ionizedGas/Makefile" ;; + "test_problems/ChemEquil_red1/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/ChemEquil_red1/Makefile" ;; + "test_problems/CpJump/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/CpJump/Makefile" ;; + "test_problems/mixGasTransport/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/mixGasTransport/Makefile" ;; + "test_problems/multiGasTransport/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/multiGasTransport/Makefile" ;; + "test_problems/printUtilUnitTest/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/printUtilUnitTest/Makefile" ;; + "test_problems/fracCoeff/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/fracCoeff/Makefile" ;; + "test_problems/negATest/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/negATest/Makefile" ;; + "test_problems/NASA9poly_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/NASA9poly_test/Makefile" ;; + "test_problems/ck2cti_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/ck2cti_test/Makefile" ;; + "test_problems/ck2cti_test/runtest" ) CONFIG_FILES="$CONFIG_FILES test_problems/ck2cti_test/runtest" ;; + "test_problems/nasa9_reader/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/nasa9_reader/Makefile" ;; + "test_problems/nasa9_reader/runtest" ) CONFIG_FILES="$CONFIG_FILES test_problems/nasa9_reader/runtest" ;; + "test_problems/min_python/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/min_python/Makefile" ;; + "test_problems/min_python/minDiamond/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/min_python/minDiamond/Makefile" ;; + "test_problems/min_python/negATest/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/min_python/negATest/Makefile" ;; + "test_problems/pureFluidTest/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/pureFluidTest/Makefile" ;; + "test_problems/rankine_democxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/rankine_democxx/Makefile" ;; + "test_problems/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/python/Makefile" ;; + "test_problems/cathermo/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/Makefile" ;; + "test_problems/cathermo/issp/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/issp/Makefile" ;; + "test_problems/cathermo/ims/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/ims/Makefile" ;; + "test_problems/cathermo/stoichSubSSTP/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/stoichSubSSTP/Makefile" ;; + "test_problems/cathermo/testIAPWS/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testIAPWS/Makefile" ;; + "test_problems/cathermo/testIAPWSPres/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testIAPWSPres/Makefile" ;; + "test_problems/cathermo/testIAPWSTripP/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testIAPWSTripP/Makefile" ;; + "test_problems/cathermo/testWaterPDSS/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testWaterPDSS/Makefile" ;; + "test_problems/cathermo/testWaterTP/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/testWaterTP/Makefile" ;; + "test_problems/cathermo/HMW_test_1/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_test_1/Makefile" ;; + "test_problems/cathermo/HMW_test_3/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_test_3/Makefile" ;; + "test_problems/cathermo/HMW_graph_GvT/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_GvT/Makefile" ;; + "test_problems/cathermo/HMW_graph_GvI/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_GvI/Makefile" ;; + "test_problems/cathermo/HMW_graph_HvT/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_HvT/Makefile" ;; + "test_problems/cathermo/HMW_graph_CpvT/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_CpvT/Makefile" ;; + "test_problems/cathermo/HMW_graph_VvT/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_graph_VvT/Makefile" ;; + "test_problems/cathermo/DH_graph_1/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_1/Makefile" ;; + "test_problems/cathermo/DH_graph_acommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_acommon/Makefile" ;; + "test_problems/cathermo/DH_graph_NM/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_NM/Makefile" ;; + "test_problems/cathermo/DH_graph_Pitzer/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_Pitzer/Makefile" ;; + "test_problems/cathermo/DH_graph_bdotak/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/DH_graph_bdotak/Makefile" ;; + "test_problems/cathermo/HMW_dupl_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/HMW_dupl_test/Makefile" ;; + "test_problems/cathermo/VPissp/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/cathermo/VPissp/Makefile" ;; + "test_problems/VCSnonideal/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/VCSnonideal/Makefile" ;; + "test_problems/VPsilane_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/VPsilane_test/Makefile" ;; + "test_problems/VPsilane_test/runtest" ) CONFIG_FILES="$CONFIG_FILES test_problems/VPsilane_test/runtest" ;; + "test_problems/VCSnonideal/NaCl_equil/Makefile" ) CONFIG_FILES="$CONFIG_FILES test_problems/VCSnonideal/NaCl_equil/Makefile" ;; + "bin/install_tsc" ) CONFIG_FILES="$CONFIG_FILES bin/install_tsc" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done - # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -11729,610 +11316,697 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, +# simply because there is no reason to put it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# Create a temporary directory, and hook for its removal unless debugging. $debug || { - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } + # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") + tmp=./confstat$$-$RANDOM + (umask 077 && mkdir $tmp) } || { - $as_echo "$as_me: cannot create a temporary directory in ." >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } +# +# CONFIG_FILES section. +# - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "\$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@LIBS@,$LIBS,;t t +s,@BITCOMPILE@,$BITCOMPILE,;t t +s,@BITHARDWARE@,$BITHARDWARE,;t t +s,@BITCHANGE@,$BITCHANGE,;t t +s,@ldemulationarg@,$ldemulationarg,;t t +s,@CVF_LIBDIR@,$CVF_LIBDIR,;t t +s,@USE_CLIB_DLL@,$USE_CLIB_DLL,;t t +s,@local_inst@,$local_inst,;t t +s,@local_python_inst@,$local_python_inst,;t t +s,@python_prefix@,$python_prefix,;t t +s,@python_win_prefix@,$python_win_prefix,;t t +s,@ctversion@,$ctversion,;t t +s,@homedir@,$homedir,;t t +s,@ct_libdir@,$ct_libdir,;t t +s,@ct_bindir@,$ct_bindir,;t t +s,@ct_incdir@,$ct_incdir,;t t +s,@ct_incroot@,$ct_incroot,;t t +s,@ct_datadir@,$ct_datadir,;t t +s,@ct_demodir@,$ct_demodir,;t t +s,@ct_templdir@,$ct_templdir,;t t +s,@ct_tutdir@,$ct_tutdir,;t t +s,@ct_docdir@,$ct_docdir,;t t +s,@ct_dir@,$ct_dir,;t t +s,@ct_mandir@,$ct_mandir,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t +s,@username@,$username,;t t +s,@ctroot@,$ctroot,;t t +s,@buildinc@,$buildinc,;t t +s,@buildlib@,$buildlib,;t t +s,@buildbin@,$buildbin,;t t +s,@MAKE@,$MAKE,;t t +s,@GRAPHVIZDIR@,$GRAPHVIZDIR,;t t +s,@ARCHIVE@,$ARCHIVE,;t t +s,@DO_RANLIB@,$DO_RANLIB,;t t +s,@RANLIB@,$RANLIB,;t t +s,@CXX_DEPENDS@,$CXX_DEPENDS,;t t +s,@USERDIR@,$USERDIR,;t t +s,@INCL_USER_CODE@,$INCL_USER_CODE,;t t +s,@CXX@,$CXX,;t t +s,@CXXFLAGS@,$CXXFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CXX@,$ac_ct_CXX,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@use_sundials@,$use_sundials,;t t +s,@CVODE_LIBS@,$CVODE_LIBS,;t t +s,@IDA_LIBS@,$IDA_LIBS,;t t +s,@sundials_include@,$sundials_include,;t t +s,@sundials_lib_dir@,$sundials_lib_dir,;t t +s,@sundials_lib@,$sundials_lib,;t t +s,@sundials_lib_dep@,$sundials_lib_dep,;t t +s,@CANTERA_DEBUG_MODE@,$CANTERA_DEBUG_MODE,;t t +s,@COMPILE_PURE_FLUIDS@,$COMPILE_PURE_FLUIDS,;t t +s,@phase_object_files@,$phase_object_files,;t t +s,@phase_header_files@,$phase_header_files,;t t +s,@COMPILE_IDEAL_SOLUTIONS@,$COMPILE_IDEAL_SOLUTIONS,;t t +s,@COMPILE_ELECTROLYTES@,$COMPILE_ELECTROLYTES,;t t +s,@NEED_CATHERMO@,$NEED_CATHERMO,;t t +s,@COMPILE_KINETICS@,$COMPILE_KINETICS,;t t +s,@COMPILE_HETEROKIN@,$COMPILE_HETEROKIN,;t t +s,@COMPILE_RXNPATH@,$COMPILE_RXNPATH,;t t +s,@WITH_REACTORS@,$WITH_REACTORS,;t t +s,@KERNEL@,$KERNEL,;t t +s,@KERNEL_OBJ@,$KERNEL_OBJ,;t t +s,@BUILD_CK@,$BUILD_CK,;t t +s,@LIB_DIR@,$LIB_DIR,;t t +s,@COMPILE_VCSNONIDEAL@,$COMPILE_VCSNONIDEAL,;t t +s,@COMPILE_H298MODIFY_CAPABILITY@,$COMPILE_H298MODIFY_CAPABILITY,;t t +s,@BOOST_INCLUDE@,$BOOST_INCLUDE,;t t +s,@BOOST_LIB@,$BOOST_LIB,;t t +s,@PURIFY@,$PURIFY,;t t +s,@build_lapack@,$build_lapack,;t t +s,@build_blas@,$build_blas,;t t +s,@BLAS_LAPACK_LIBS@,$BLAS_LAPACK_LIBS,;t t +s,@BLAS_LAPACK_LINK@,$BLAS_LAPACK_LINK,;t t +s,@BLAS_LAPACK_DIR@,$BLAS_LAPACK_DIR,;t t +s,@build_with_f2c@,$build_with_f2c,;t t +s,@build_f2c_lib@,$build_f2c_lib,;t t +s,@F2C_SYSTEMLIB@,$F2C_SYSTEMLIB,;t t +s,@BOOST_LIB_DIR@,$BOOST_LIB_DIR,;t t +s,@LOCAL_LIB_DIRS@,$LOCAL_LIB_DIRS,;t t +s,@LOCAL_LIBS@,$LOCAL_LIBS,;t t +s,@LOCAL_LIBS_DEP@,$LOCAL_LIBS_DEP,;t t +s,@INSTALL_LIBS_DEP@,$INSTALL_LIBS_DEP,;t t +s,@RAW_LIBS_DEP@,$RAW_LIBS_DEP,;t t +s,@CANTERA_CORE_LIBS@,$CANTERA_CORE_LIBS,;t t +s,@CANTERA_CORE_LIBS_DEP@,$CANTERA_CORE_LIBS_DEP,;t t +s,@CT_SHARED_LIB@,$CT_SHARED_LIB,;t t +s,@PYTHON_CMD@,$PYTHON_CMD,;t t +s,@BUILD_PYTHON@,$BUILD_PYTHON,;t t +s,@NUMPY_INC_DIR@,$NUMPY_INC_DIR,;t t +s,@NUMPY_HOME@,$NUMPY_HOME,;t t +s,@NUMARRAY_INC_DIR@,$NUMARRAY_INC_DIR,;t t +s,@NUMARRAY_HOME@,$NUMARRAY_HOME,;t t +s,@CANTERA_PYTHON_HOME@,$CANTERA_PYTHON_HOME,;t t +s,@CVSTAG@,$CVSTAG,;t t +s,@MATLAB_CMD@,$MATLAB_CMD,;t t +s,@BUILD_MATLAB@,$BUILD_MATLAB,;t t +s,@BUILD_CLIB@,$BUILD_CLIB,;t t +s,@export_name@,$export_name,;t t +s,@PIC@,$PIC,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@CXXCPP@,$CXXCPP,;t t +s,@EGREP@,$EGREP,;t t +s,@SOEXT@,$SOEXT,;t t +s,@SHARED@,$SHARED,;t t +s,@CXX_INCLUDES@,$CXX_INCLUDES,;t t +s,@LCXX_FLAGS@,$LCXX_FLAGS,;t t +s,@LCXX_END_LIBS@,$LCXX_END_LIBS,;t t +s,@HAVE_STRIPSYMBOLS@,$HAVE_STRIPSYMBOLS,;t t +s,@F77@,$F77,;t t +s,@FFLAGS@,$FFLAGS,;t t +s,@ac_ct_F77@,$ac_ct_F77,;t t +s,@FLIBS@,$FLIBS,;t t +s,@F90@,$F90,;t t +s,@BUILD_F90@,$BUILD_F90,;t t +s,@F90FLAGS@,$F90FLAGS,;t t +s,@F90BUILDFLAGS@,$F90BUILDFLAGS,;t t +s,@F90LIBS@,$F90LIBS,;t t +s,@precompile_headers@,$precompile_headers,;t t +s,@OS_IS_DARWIN@,$OS_IS_DARWIN,;t t +s,@OS_IS_WIN@,$OS_IS_WIN,;t t +s,@OS_IS_CYGWIN@,$OS_IS_CYGWIN,;t t +s,@SHARED_CTLIB@,$SHARED_CTLIB,;t t +s,@mex_ext@,$mex_ext,;t t +s,@F77_EXT@,$F77_EXT,;t t +s,@CXX_EXT@,$CXX_EXT,;t t +s,@OBJ_EXT@,$OBJ_EXT,;t t +s,@EXE_EXT@,$EXE_EXT,;t t +s,@math_libs@,$math_libs,;t t +s,@SO@,$SO,;t t +s,@LDSHARED@,$LDSHARED,;t t +s,@EXTRA_LINK@,$EXTRA_LINK,;t t +s,@TSCOMPARE_abs@,$TSCOMPARE_abs,;t t +s,@INSTALL_abs@,$INSTALL_abs,;t t +s,@INSTALL_VERBOSE@,$INSTALL_VERBOSE,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t +CEOF + +_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\).*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\).*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } -_ACEOF - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || -BEGIN { _ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then - break - elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; - esac - ;; +cat >>$CONFIG_STATUS <<\_ACEOF +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - ac_dir=`$as_dirname -- "$ac_file" || + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} { (exit 1); exit 1; }; }; } + ac_builddir=. -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi case $srcdir in - .) # We are building in place. + .) # No --srcdir option. We are building in place. ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac - case $ac_mode in - :F) - # - # CONFIG_FILE - # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; - esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - ;; - :H) - # - # CONFIG_HEADER - # +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +s,@INSTALL@,$ac_INSTALL,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - fi + mv $tmp/out $ac_file else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + cat $tmp/out + rm -f $tmp/out fi - ;; +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +# +# CONFIG_HEADER section. +# + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' +ac_uC=' ' +ac_uD=',;t' + +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac -done # for ac_tag + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + +_ACEOF + +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\_ACEOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +_ACEOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +rm -f confdef2sed.sed + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >>conftest.undefs <<\_ACEOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +_ACEOF + +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # grep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS + +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.undefs >/dev/null +do + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\_ACEOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi +done +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save -test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -12354,10 +12028,6 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi # ) if test "x${OS_IS_WIN}" = "x1"; then diff --git a/configure.in b/configure.in index a3b99e032..dea227a0d 100755 --- a/configure.in +++ b/configure.in @@ -1072,41 +1072,108 @@ fi AC_SUBST(BUILD_PYTHON) AC_DEFINE_UNQUOTED(PYTHON_EXE,"$PYTHON_CMD") +USE_NUMARRAY='y' + if test "$USE_NUMERIC" = "y"; then +USE_NUMARRAY='n' +USE_NUMPY='n' AC_DEFINE(HAS_NUMERIC) fi -if test -n "$NUMARRAY_INC_DIR" ; then - echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" -else - NUMARRAY_INC_DIR="" - if test -n "$NUMARRAY_HOME"; then - dir5="$NUMARRAY_HOME/include/python2.5" - if test -d $dir5 ; then - NUMARRAY_INC_DIR=$dir5 +if test "$USE_NUMPY" = "y"; then +USE_NUMARRAY='n' +AC_DEFINE(HAS_NUMPY) +fi + +if test "$USE_NUMARRAY" = "y"; then +AC_DEFINE(HAS_NUMARRAY) +fi + +if test "$USE_NUMARRAY" = "y"; then + if test -n "$NUMARRAY_INC_DIR" ; then + echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" else - dir4="$NUMARRAY_HOME/include/python2.4" - if test -d $dir4 ; then - NUMARRAY_INC_DIR=$dir4 + NUMARRAY_INC_DIR="" + if test -n "$NUMARRAY_HOME"; then + dir5="$NUMARRAY_HOME/include/python2.5" + if test -d $dir5 ; then + NUMARRAY_INC_DIR=$dir5 else - dir3="$NUMARRAY_HOME/include/python2.3" - if test -d $dir3 ; then - NUMARRAY_INC_DIR=$dir3 + dir4="$NUMARRAY_HOME/include/python2.4" + if test -d $dir4 ; then + NUMARRAY_INC_DIR=$dir4 else - dir1="$NUMARRAY_HOME/include/python" - if test -d $dir1 ; then - NUMARRAY_INC_DIR=$dir1 + dir3="$NUMARRAY_HOME/include/python2.3" + if test -d $dir3 ; then + NUMARRAY_INC_DIR=$dir3 else - echo "WARNING: NUMARRAY include dir $dir1 does not exist." - NUMARRAY_INC_DIR=$dir1 + dir1="$NUMARRAY_HOME/include/python" + if test -d $dir1 ; then + NUMARRAY_INC_DIR=$dir1 + else + echo "WARNING: NUMARRAY include dir $dir1 does not exist." + NUMARRAY_INC_DIR=$dir1 + fi fi fi fi + echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" + fi fi - echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR" - fi +else + NUMARRAY_INC_DIR="" + NUMARRAY_HOME="" fi + +if test "$USE_NUMPY" = "y"; then + if test -n "$NUMPY_INC_DIR" ; then + echo "setting NUMPY_INC_DIR to $NUMPY_INC_DIR" + else + NUMPY_INC_DIR="" + if test -n "$NUMPY_HOME"; then + dir6="$NUMPY_HOME/include/python2.6" + if test -d $dir6 ; then + NUMPY_INC_DIR=$dir6 + else + dir5="$NUMPY_HOME/include/python2.5" + if test -d $dir5 ; then + NUMPY_INC_DIR=$dir5 + else + dir4="$NUMPY_HOME/include/python2.4" + if test -d $dir4 ; then + NUMPY_INC_DIR=$dir4 + else + dir3="$NUMPY_HOME/include/python2.3" + if test -d $dir3 ; then + NUMPY_INC_DIR=$dir3 + else + dir2="$NUMPY_HOME/include/python2.2" + if test -d $dir2 ; then + NUMPY_INC_DIR=$dir2 + else + dir1="$NUMPY_HOME/include/python" + if test -d $dir1 ; then + NUMPY_INC_DIR=$dir1 + else + echo "WARNING: NUMPY include dir $dir1 does not exist." + NUMPY_INC_DIR=$dir1 + fi + fi + fi + fi + fi + fi + echo "setting NUMPY_INC_DIR to $NUMPY_INC_DIR" + fi + fi +else + NUMPY_INC_DIR="" + NUMPY_HOME="" +fi +AC_SUBST(NUMPY_INC_DIR) +AC_SUBST(NUMPY_HOME) + # this fails, at least on a Mac. By default, numarray include files # are installed in the include directory in the Python framework. This # does not require setting NUMARRAY_INC_DIR, so testing that it is @@ -1124,6 +1191,7 @@ fi #fi #fi + AC_SUBST(NUMARRAY_INC_DIR) AC_SUBST(NUMARRAY_HOME) AC_SUBST(CANTERA_PYTHON_HOME) diff --git a/preconfig b/preconfig index 1fc5aec1e..fe2b5f655 100755 --- a/preconfig +++ b/preconfig @@ -72,15 +72,27 @@ PYTHON_PACKAGE=${PYTHON_PACKAGE:="minimal"} # different name, set this to the full path to the Python interpreter. PYTHON_CMD=${PYTHON_CMD:="default"} + # The Cantera Python interface can be built with either the numarray -# or Numeric packages. Set this to "y" to use Numeric, or anything -# else to use numarray. Using numarray is preferred. +# numeric, or numpy packages. Set this to "y" to use Numeric. USE_NUMERIC=${USE_NUMERIC:="n"} +# The Cantera Python interface can be built with either the numarray +# or Numeric packages. Set this to "y" to use numpy, or 'n' +# to use numarray. set USE_NUMERIC to 'n' also if you want to use numarray. +# Using numpy is preferred, and is the supported option going forwards. +USE_NUMPY=${USE_NUMPY:="n"} + +# If numpy was installed using the --home option, set this to the +# home directory for numpy. This will be needed for all numpy installations +# that don't put the include files into python's native include directory. +#NUMPY_HOME=${NUMPY_HOME:="$HOME/python_packages"} + # If numarray was installed using the --home option, set this to the # home directory for numarray. #NUMARRAY_HOME=${NUMARRAY_HOME:="$HOME/python_packages"} + # If you want to install the Cantera Python package somewhere other # than the default 'site-packages' directory within the Python library # directory, then set this to the desired directory. This is useful when @@ -543,7 +555,9 @@ export RPFONT export FORTRAN_LIB_DIR export CANTERA_INSTALL_DIR export USE_NUMERIC +export USE_NUMPY export NUMARRAY_HOME +export NUMPY_HOME export CANTERA_PYTHON_HOME export USE_SUNDIALS export SUNDIALS_HOME diff --git a/test_problems/VCSnonideal/NaCl_equil/good_dout.txt b/test_problems/VCSnonideal/NaCl_equil/good_dout.txt index 36678028c..5b996bb1a 100644 --- a/test_problems/VCSnonideal/NaCl_equil/good_dout.txt +++ b/test_problems/VCSnonideal/NaCl_equil/good_dout.txt @@ -263,7 +263,21 @@ VCS CALCULATION METHOD ----------------------------------------------------------------------------- --- Subroutine vcs_deltag called for all noncomponents --- Species Status decision is reavaluated: All species are minor except for: - --- Zeroed Species in an active MS phase (tmp): OH + --- Major Species : NaCl(S) + --- Major Species : N2 + --- Major Species : H2O(L) + --- Zeroed Species in an active MS phase (tmp): O2 + --- Zeroed Species in an active MS phase (tmp): H+ + --- Zeroed Species in an active MS phase (tmp): Na+ + --- CO2 can not be nonzero because needed element C is zero + --- Zeroed Species in an active MS phase (Stoich Constraint): CO2 + --- Zeroed Species in an active MS phase (tmp): H2 + --- Zeroed Species in an active MS phase (tmp): H2O + --- Zeroed Species in an active MS phase (tmp): NaCl + --- Zeroed Species in an active MS phase (tmp): Cl- + --- OH is prevented from popping into existance because a needed component to be consumed, O2, has a zero mole number + --- Zeroed Species in an active MS phase (Stoich Constraint): OH + --- Zeroed Species in an active MS phase (tmp): OH- --- --- Element Abundance check passed @@ -276,21 +290,36 @@ VCS CALCULATION METHOD --- air 2 NA 4.000e+00 --- NaCl(S) 2 NA 5.000e+00 -------------------------------------------------------------- - --- vcs_RxnStepSizes not called because allspecies are minors + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H2 0.0000E+00 1.1000E-24 -3.8996E+02 | MultSpec (Tmp Zeroed in MS): small species born again DG = -3.900E+02 + --- H2O 0.0000E+00 1.1000E-24 -3.2029E+02 | MultSpec (Tmp Zeroed in MS): small species born again DG = -3.203E+02 + --- NaCl 0.0000E+00 1.1000E-24 -2.5004E+02 | MultSpec (Tmp Zeroed in MS): small species born again DG = -2.500E+02 + --- Cl- 0.0000E+00 1.1000E-24 -6.4175E+02 | MultSpec (Tmp Zeroed in MS): small species born again DG = -6.418E+02 + --- OH 0.0000E+00 0.0000E+00 0.0000E+00 | MultSpec (Stoich Zeroed in MS): still dead DG = 0.000E+00 + --- OH- 0.0000E+00 1.1000E-24 -6.0585E+02 | MultSpec (Tmp Zeroed in MS): small species born again DG = -6.058E+02 + ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Full Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H2 0 0.0000E+00 7.2260E-54 7.2260E-54 | minor species alternative calc - --- H2O 0 0.0000E+00 7.2260E-54 7.2260E-54 | minor species alternative calc - --- NaCl 0 0.0000E+00 7.2260E-54 7.2260E-54 | minor species alternative calc - --- Cl- 0 0.0000E+00 7.2260E-54 7.2260E-54 | minor species alternative calc - --- OH -7 0.0000E+00 0.0000E+00 0.0000E+00 | Species stays zeroed: DG = 0.0000E+00 - --- OH- 0 0.0000E+00 7.2260E-54 7.2260E-54 | minor species alternative calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.4452E-53 | + --- Zeroed species changed to minor: H2 + --- H2 0 0.0000E+00 1.1000E-26 1.1000E-26 | Born:IC=-1 to IC=1:DG=-3.8996E+02 + --- Zeroed species changed to minor: H2O + --- H2O 0 0.0000E+00 1.1000E-26 1.1000E-26 | Born:IC=-1 to IC=1:DG=-3.2029E+02 + --- Zeroed species changed to minor: NaCl + --- NaCl 0 0.0000E+00 1.1000E-26 1.1000E-26 | Born:IC=-1 to IC=1:DG=-2.5004E+02 + --- Zeroed species changed to minor: Cl- + --- Cl- 0 0.0000E+00 1.1000E-26 1.1000E-26 | Born:IC=-1 to IC=1:DG=-6.4175E+02 + --- OH -8 0.0000E+00 0.0000E+00 0.0000E+00 | Species stays zeroed: DG = 0.0000E+00 + --- Zeroed species changed to minor: OH- + --- OH- 0 0.0000E+00 1.1000E-26 1.1000E-26 | Born:IC=-1 to IC=1:DG=-6.0585E+02 + --- NaCl(S) c 5.0000E+00 5.0000E+00-2.2000E-26 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 2.0000E+00 2.0000E+00-2.1678E-53 | - --- O2 c 0.0000E+00 3.6130E-54 3.6130E-54 | - --- H+ c 0.0000E+00 7.2260E-54 7.2260E-54 | - --- Na+ c 0.0000E+00 7.2260E-54 7.2260E-54 | + --- H2O(L) c 2.0000E+00 2.0000E+00-3.3000E-26 | + --- O2 c 0.0000E+00 5.5000E-27 5.5000E-27 | + --- H+ c 0.0000E+00 1.1000E-26 1.1000E-26 | + --- Na+ c 0.0000E+00 1.1000E-26 1.1000E-26 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -298,8 +327,8 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2121958436320E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2121958436320E+03 - --- subroutine FORCE: Beginning Slope = -1.59542e-50 - --- subroutine FORCE: End Slope = -5.11771e-51 + --- subroutine FORCE: Beginning Slope = -2.42868e-23 + --- subroutine FORCE: End Slope = -2.62695e-24 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (all species): @@ -307,17 +336,17 @@ VCS CALCULATION METHOD --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.304522E+01 -2.304522E+01 --- H2O(L) 2.000000E+00 2.000000E+00 -1.237155E+02 -1.237155E+02 - --- O2 0.000000E+00 3.612987E-54 -3.484219E+02 -1.491150E+02 - --- H+ 0.000000E+00 7.225974E-54 -3.190385E+02 -1.190385E+02 - --- Na+ 0.000000E+00 7.225974E-54 -4.230144E+02 -2.230144E+02 + --- O2 0.000000E+00 5.500000E-27 -3.484219E+02 -8.652501E+01 + --- H+ 0.000000E+00 1.100000E-26 -3.190385E+02 -5.644851E+01 + --- Na+ 0.000000E+00 1.100000E-26 -4.230144E+02 -1.604244E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082000E+02 -5.082000E+02 - --- H2 0 0.000000E+00 7.225974E-54 -3.394654E+02 -1.394654E+02 -3.899609E+02 -9.030743E+01 - --- H2O 0 0.000000E+00 7.225974E-54 -4.440100E+02 -2.440100E+02 -3.202944E+02 -1.202944E+02 - --- NaCl 0 0.000000E+00 7.225974E-54 -4.245582E+02 -2.245582E+02 -2.500414E+02 -5.004139E+01 - --- Cl- 0 0.000000E+00 7.225974E-54 -3.932526E+02 -1.932526E+02 -6.417502E+02 -2.417502E+02 - --- OH -7 0.000000E+00 0.000000E+00 -4.152353E+02 -4.152353E+02 0.000000E+00 -3.160987E+02 - --- OH- 0 0.000000E+00 7.225974E-54 -4.105220E+02 -2.105220E+02 -6.058450E+02 -2.058450E+02 - --- Norms of Delta G(): 4.274089E+02 1.940207E+02 + --- H2 0 0.000000E+00 1.100000E-26 -3.394654E+02 -7.687542E+01 -3.899609E+02 3.577582E+00 + --- H2O 0 0.000000E+00 1.100000E-26 -4.440100E+02 -1.814199E+02 -3.202944E+02 -5.770444E+01 + --- NaCl 0 0.000000E+00 1.100000E-26 -4.245582E+02 -1.619682E+02 -2.500414E+02 1.254862E+01 + --- Cl- 0 0.000000E+00 1.100000E-26 -3.932526E+02 -1.306626E+02 -6.417502E+02 -1.165702E+02 + --- OH -8 0.000000E+00 0.000000E+00 -4.152353E+02 -4.152353E+02 0.000000E+00 -3.317462E+02 + --- OH- 0 0.000000E+00 1.100000E-26 -4.105220E+02 -1.479320E+02 -6.058450E+02 -8.066500E+01 + --- Norms of Delta G(): 4.274089E+02 1.492487E+02 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 2.0000000E+00 @@ -352,25 +381,34 @@ VCS CALCULATION METHOD --- NaCl(S) ( 5) remains as component 0 --- N2 ( 4) remains as component 1 --- H2O(L) ( 2) remains as component 2 - --- OH- ( 7.2e-54) replaces O2 ( 3.6e-54) as component 3 - --- Na+ ( 7.2e-54) replaces H+ ( 7.2e-54) as component 4 - --- H2 ( 7.2e-54) replaces H+ ( 7.2e-54) as component 5 + --- OH- ( 1.1e-26) replaces O2 ( 5.5e-27) as component 3 + --- Na+ ( 1.1e-26) replaces H+ ( 1.1e-26) as component 4 + --- H2 ( 1.1e-26) replaces H+ ( 1.1e-26) as component 5 --- CO2 ( 0) remains as component 6 --- Total number of components found = 7 (ne = 11) --- Components: 0 1 2 3 4 5 6 - --- Components Moles: 5 4 2 7.23e-54 7.23e-54 7.23e-54 0 + --- Components Moles: 5 4 2 1.1e-26 1.1e-26 1.1e-26 0 --- NonComponent| Moles | NaCl(S) N2 H2O(L) OH- Na+ H2 CO2 - --- 7 H+ | 7.23e-54| -0.00 -0.00 -1.00 1.00 0.00 0.00 -0.00 - --- 8 H2O | 7.23e-54| -0.00 -0.00 -1.00 0.00 0.00 0.00 -0.00 - --- 9 NaCl | 7.23e-54| -1.00 -0.00 0.00 0.00 0.00 0.00 -0.00 - --- 10 Cl- | 7.23e-54| -1.00 -0.00 0.00 0.00 1.00 0.00 -0.00 + --- 7 H+ | 1.1e-26| -0.00 -0.00 -1.00 1.00 0.00 0.00 -0.00 + --- 8 H2O | 1.1e-26| -0.00 -0.00 -1.00 0.00 0.00 0.00 -0.00 + --- 9 NaCl | 1.1e-26| -1.00 -0.00 0.00 0.00 0.00 0.00 -0.00 + --- 10 Cl- | 1.1e-26| -1.00 -0.00 0.00 0.00 1.00 0.00 -0.00 --- 11 OH | 0| -0.00 -0.00 -1.00 0.00 0.00 0.50 -0.00 - --- 12 O2 | 3.61e-54| -0.00 -0.00 -2.00 0.00 0.00 2.00 -0.00 + --- 12 O2 | 5.5e-27| -0.00 -0.00 -2.00 0.00 0.00 2.00 -0.00 ----------------------------------------------------------------------------- --- Subroutine vcs_deltag called for all noncomponents --- Species Status decision is reavaluated: All species are minor except for: + --- Major Species : NaCl(S) + --- Major Species : N2 + --- Major Species : H2O(L) + --- Major Species : OH- + --- Major Species : Na+ + --- Major Species : H2 + --- CO2 can not be nonzero because needed element C is zero + --- Zeroed Species in an active MS phase (Stoich Constraint): CO2 --- Major Species : H+ --- Major Species : Cl- + --- Zeroed Species in an active MS phase (tmp): OH --- Major Species : O2 --- --- Element Abundance check passed @@ -388,27 +426,28 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 7.2260E-54 7.4372E-52 -2.0585E+02 | Normal Calc - --- H2O 7.2260E-54 8.6924E-52 -1.2029E+02 | Normal Calc - --- NaCl 7.2260E-54 3.6160E-52 -5.0041E+01 | Normal Calc - --- Cl- 7.2260E-54 8.7344E-52 -2.4175E+02 | Normal Calc - --- OH 0.0000E+00 1.1000E-24 -3.6125E+02 | MultSpec: small species born again DG = -3.613E+02 - --- O2 3.6130E-54 2.1752E-52 -1.8061E+02 | Normal Calc + --- H+ 1.1000E-26 4.4366E-25 -8.0665E+01 | Normal calc: diag adjusted from 1.81818e+26 to 1.81818e+26 due to act coeff + --- H2O 1.1000E-26 6.3475E-25 -5.7704E+01 | Normal Calc + --- NaCl 1.1000E-26 0.0000E+00 1.2549E+01 | Skipped: IC = 0 and DG >0: 1.255E+01 + --- Cl- 1.1000E-26 6.4114E-25 -1.1657E+02 | Normal calc: diag adjusted from 1.81818e+26 to 1.81818e+26 due to act coeff + --- OH 0.0000E+00 1.1000E-24 -3.2996E+02 | MultSpec (Tmp Zeroed in MS): small species born again DG = -3.300E+02 + --- O2 5.5000E-27 -5.5000E-27 7.1552E+00 | Delta damped from -1.31178e-26 to -5.5e-27 due to component 5 ( H2) going neg ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Full Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 7.2260E-54 7.5094E-52 7.4372E-52 | Normal Major Calc - --- H2O 0 7.2260E-54 4.0000E-04 4.0000E-04 | minor species alternative calc - --- NaCl 0 7.2260E-54 3.9048E-32 3.9048E-32 | minor species alternative calc - --- Cl- 1 7.2260E-54 8.8067E-52 8.7344E-52 | Normal Major Calc - --- OH 0 0.0000E+00 7.2260E-54 7.2260E-54 | minor species alternative calc - --- O2 1 3.6130E-54 2.2113E-52 2.1752E-52 | Normal Major Calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-3.9048E-32 | + --- H+ 1 1.1000E-26 4.5466E-25 4.4366E-25 | Normal Major Calc + --- H2O 0 1.1000E-26 4.0000E-04 4.0000E-04 | minor species alternative calc + --- NaCl 0 1.1000E-26 3.9048E-32-1.1000E-26 | minor species alternative calc + --- Cl- 1 1.1000E-26 6.5214E-25 6.4114E-25 | Normal Major Calc + --- Zeroed species changed to minor: OH + --- OH 0 0.0000E+00 1.1000E-26 1.1000E-26 | Born:IC=-1 to IC=1:DG=-3.2996E+02 + --- O2 1 5.5000E-27 5.5000E-28-4.9500E-27 | initial nonpos kmoles= 0.000E+00 + --- NaCl(S) c 5.0000E+00 5.0000E+00-6.3014E-25 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | --- H2O(L) c 2.0000E+00 1.9996E+00-4.0000E-04 | - --- OH- c 7.2260E-54 7.5094E-52 7.4372E-52 | - --- Na+ c 7.2260E-54 8.8067E-52 8.7344E-52 | - --- H2 c 7.2260E-54 4.4588E-52 4.3865E-52 | + --- OH- c 1.1000E-26 4.5466E-25 4.4366E-25 | + --- Na+ c 1.1000E-26 6.5214E-25 6.4114E-25 | + --- H2 c 1.1000E-26 6.6000E-27-4.4000E-27 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -416,7 +455,7 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2121958436320E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- subroutine FORCE: Beginning Slope = -0.0481178 + --- subroutine FORCE: Beginning Slope = -0.0230818 --- subroutine FORCE: End Slope = -0.00230267 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- @@ -425,17 +464,17 @@ VCS CALCULATION METHOD --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.304522E+01 -2.304532E+01 --- H2O(L) 2.000000E+00 1.999600E+00 -1.237155E+02 -1.237155E+02 - --- OH- 7.225974E-54 7.509413E-52 -2.105220E+02 -2.058782E+02 - --- Na+ 7.225974E-54 8.806664E-52 -2.230144E+02 -2.182112E+02 - --- H2 7.225974E-54 4.458784E-52 -1.394654E+02 -1.353432E+02 + --- OH- 1.100000E-26 4.546575E-25 -1.479320E+02 -1.442101E+02 + --- Na+ 1.100000E-26 6.521361E-25 -1.604244E+02 -1.563419E+02 + --- H2 1.100000E-26 6.600000E-27 -7.687542E+01 -7.738635E+01 --- CO2 0.000000E+00 0.000000E+00 -5.082000E+02 -5.082001E+02 - --- H+ 1 7.225974E-54 7.509413E-52 -1.190385E+02 -1.143947E+02 -2.058450E+02 -1.965573E+02 - --- H2O 0 7.225974E-54 4.000000E-04 -2.440100E+02 -1.294722E+02 -1.202944E+02 -5.756680E+00 - --- NaCl 0 7.225974E-54 3.904774E-32 -2.245582E+02 -1.745169E+02 -5.004139E+01 -9.999500E-05 - --- Cl- 1 7.225974E-54 8.806664E-52 -1.932526E+02 -1.884494E+02 -2.417502E+02 -2.321438E+02 - --- OH 0 0.000000E+00 7.225974E-54 -4.152353E+02 -2.152354E+02 -3.612525E+02 -1.591914E+02 - --- O2 1 3.612987E-54 2.211327E-52 -1.491150E+02 -1.450009E+02 -1.806149E+02 -1.682562E+02 - --- Norms of Delta G(): 2.163775E+02 1.561040E+02 + --- H+ 1 1.100000E-26 4.546575E-25 -5.644851E+01 -5.272667E+01 -8.066500E+01 -7.322130E+01 + --- H2O 0 1.100000E-26 4.000000E-04 -1.814199E+02 -1.294722E+02 -5.770444E+01 -5.756680E+00 + --- NaCl 0 1.100000E-26 3.904774E-32 -1.619682E+02 -1.745169E+02 1.254862E+01 -9.999499E-05 + --- Cl- 1 1.100000E-26 6.521361E-25 -1.306626E+02 -1.265800E+02 -1.165702E+02 -1.084051E+02 + --- OH 0 0.000000E+00 1.100000E-26 -4.152353E+02 -1.526453E+02 -3.299575E+02 -6.762301E+01 + --- O2 1 5.500000E-27 5.500000E-28 -8.652501E+01 -8.882770E+01 7.155163E+00 3.830627E+00 + --- Norms of Delta G(): 1.486079E+02 6.018542E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 1.9996000E+00 @@ -446,456 +485,6 @@ VCS CALCULATION METHOD --- Total New Dimensionless Gibbs Free Energy = -1.2121985462840E+03 --- Increment counter increased, step is accepted: 2 --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Reevaluate major-minor status of noncomponents: - --- Noncomponent turned from minor to major: OH - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 2, Iterations since last evaluation of optimal basis = 1 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 2.000e+00 - --- air 2 NA 4.000e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 7.5094E-52 7.3802E-50 -1.9656E+02 | Normal Calc - --- H2O 4.0000E-04 2.3029E-03 -5.7567E+00 | Normal Calc - --- NaCl 3.9048E-32 3.9046E-36 -9.9995E-05 | Normal Calc - --- Cl- 8.8067E-52 1.0222E-49 -2.3214E+02 | Normal Calc - --- OH 7.2260E-54 1.1457E-51 -1.5919E+02 | Normal Calc - --- O2 2.2113E-52 1.2470E-50 -1.6826E+02 | Normal Calc - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 7.5094E-52 7.4552E-50 7.3802E-50 | Normal Major Calc - --- H2O 0 4.0000E-04 4.0000E-04 0.0000E+00 | minor species not considered - --- NaCl 0 3.9048E-32 3.9048E-32 0.0000E+00 | minor species not considered - --- Cl- 1 8.8067E-52 1.0310E-49 1.0222E-49 | Normal Major Calc - --- OH 1 7.2260E-54 1.1529E-51 1.1457E-51 | Normal Major Calc - --- O2 1 2.2113E-52 1.2691E-50 1.2470E-50 | Normal Major Calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.0222E-49 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9996E+00 1.9996E+00-9.9887E-50 | - --- OH- c 7.5094E-52 7.4552E-50 7.3802E-50 | - --- Na+ c 8.8067E-52 1.0310E-49 1.0222E-49 | - --- H2 c 4.4588E-52 2.5958E-50 2.5512E-50 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- subroutine FORCE: Beginning Slope = -4.05166e-47 - --- subroutine FORCE: End Slope = -3.87042e-47 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.304532E+01 -2.304532E+01 - --- H2O(L) 1.999600E+00 1.999600E+00 -1.237155E+02 -1.237155E+02 - --- OH- 7.509413E-52 7.455246E-50 -2.058782E+02 -2.012802E+02 - --- Na+ 8.806664E-52 1.031013E-49 -2.182112E+02 -2.134484E+02 - --- H2 4.458784E-52 2.595807E-50 -1.353432E+02 -1.312790E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082001E+02 -5.082001E+02 - --- H+ 1 7.509413E-52 7.455246E-50 -1.143947E+02 -1.097967E+02 -1.965573E+02 -1.873615E+02 - --- H2O 0 4.000000E-04 4.000000E-04 -1.294722E+02 -1.294722E+02 -5.756680E+00 -5.756680E+00 - --- NaCl 0 3.904774E-32 3.904774E-32 -1.745169E+02 -1.745169E+02 -9.999500E-05 -9.999500E-05 - --- Cl- 1 8.806664E-52 1.031013E-49 -1.884494E+02 -1.836866E+02 -2.321438E+02 -2.226183E+02 - --- OH 1 7.225974E-54 1.152897E-51 -2.152354E+02 -2.101630E+02 -1.591914E+02 -1.520870E+02 - --- O2 1 2.211327E-52 1.269081E-50 -1.450009E+02 -1.409510E+02 -1.682562E+02 -1.560780E+02 - --- Norms of Delta G(): 1.561040E+02 1.484291E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.9996000E+00 - --- air = 4.0004000E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Increment counter increased, step is accepted: 3 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 3, Iterations since last evaluation of optimal basis = 2 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 2.000e+00 - --- air 2 NA 4.000e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 7.4552E-50 6.9841E-48 -1.8736E+02 | Normal Calc - --- H2O 4.0000E-04 2.3029E-03 -5.7567E+00 | Normal Calc - --- NaCl 3.9048E-32 3.9046E-36 -9.9995E-05 | Normal Calc - --- Cl- 1.0310E-49 1.1476E-47 -2.2262E+02 | Normal Calc - --- OH 1.1529E-51 1.7342E-49 -1.5209E+02 | Normal Calc - --- O2 1.2691E-50 6.7017E-49 -1.5608E+02 | Normal Calc - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 7.4552E-50 7.0587E-48 6.9841E-48 | Normal Major Calc - --- H2O 0 4.0000E-04 4.0000E-04 0.0000E+00 | minor species not considered - --- NaCl 0 3.9048E-32 3.9048E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.0310E-49 1.1579E-47 1.1476E-47 | Normal Major Calc - --- OH 1 1.1529E-51 1.7457E-49 1.7342E-49 | Normal Major Calc - --- O2 1 1.2691E-50 6.8286E-49 6.7017E-49 | Normal Major Calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.1476E-47 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9996E+00 1.9996E+00-8.4979E-48 | - --- OH- c 7.4552E-50 7.0587E-48 6.9841E-48 | - --- Na+ c 1.0310E-49 1.1579E-47 1.1476E-47 | - --- H2 c 2.5958E-50 1.4530E-48 1.4271E-48 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- subroutine FORCE: Beginning Slope = -3.99432e-45 - --- subroutine FORCE: End Slope = -3.81311e-45 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.304532E+01 -2.304532E+01 - --- H2O(L) 1.999600E+00 1.999600E+00 -1.237155E+02 -1.237155E+02 - --- OH- 7.455246E-50 7.058681E-48 -2.012802E+02 -1.967297E+02 - --- Na+ 1.031013E-49 1.157922E-47 -2.134484E+02 -2.087272E+02 - --- H2 2.595807E-50 1.453013E-48 -1.312790E+02 -1.272541E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082001E+02 -5.082001E+02 - --- H+ 1 7.455246E-50 7.058681E-48 -1.097967E+02 -1.052462E+02 -1.873615E+02 -1.782605E+02 - --- H2O 0 4.000000E-04 4.000000E-04 -1.294722E+02 -1.294722E+02 -5.756680E+00 -5.756680E+00 - --- NaCl 0 3.904774E-32 3.904774E-32 -1.745169E+02 -1.745169E+02 -9.999500E-05 -9.999500E-05 - --- Cl- 1 1.031013E-49 1.157922E-47 -1.836866E+02 -1.789653E+02 -2.226183E+02 -2.131757E+02 - --- OH 1 1.152897E-51 1.745681E-49 -2.101630E+02 -2.051430E+02 -1.520870E+02 -1.450545E+02 - --- O2 1 1.269081E-50 6.828645E-49 -1.409510E+02 -1.369656E+02 -1.560780E+02 -1.440427E+02 - --- Norms of Delta G(): 1.484291E+02 1.408563E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.9996000E+00 - --- air = 4.0004000E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Increment counter increased, step is accepted: 4 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - --- Subroutine vcs_dfe called for components and minors - --- Subroutine vcs_deltag called for minor noncomponents - -============================================================================================================== - Iteration = 4, Iterations since last evaluation of optimal basis = 3 (all species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 2.000e+00 - --- air 2 NA 4.000e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 7.0587E-48 6.2914E-46 -1.7826E+02 | Normal Calc - --- H2O 4.0000E-04 2.3029E-03 -5.7567E+00 | Normal Calc - --- NaCl 3.9048E-32 3.9046E-36 -9.9995E-05 | Normal Calc - --- Cl- 1.1579E-47 1.2342E-45 -2.1318E+02 | Normal Calc - --- OH 1.7457E-49 2.4584E-47 -1.4505E+02 | Normal Calc - --- O2 6.8286E-49 3.4155E-47 -1.4404E+02 | Normal Calc - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Full Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 7.0587E-48 6.3620E-46 6.2914E-46 | Normal Major Calc - --- H2O 0 4.0000E-04 4.0000E-02 3.9600E-02 | minor species alternative calc - --- NaCl 0 3.9048E-32 3.9052E-32 3.9048E-36 | minor species alternative calc - --- Cl- 1 1.1579E-47 1.2458E-45 1.2342E-45 | Normal Major Calc - --- OH 1 1.7457E-49 2.4758E-47 2.4584E-47 | Normal Major Calc - --- O2 1 6.8286E-49 3.4838E-47 3.4155E-47 | Normal Major Calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-3.9048E-36 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9996E+00 1.9600E+00-3.9600E-02 | - --- OH- c 7.0587E-48 6.3620E-46 6.2914E-46 | - --- Na+ c 1.1579E-47 1.2458E-45 1.2342E-45 | - --- H2 c 1.4530E-48 8.2055E-47 8.0602E-47 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2122820993609E+03 - --- subroutine FORCE: Beginning Slope = -0.227965 - --- subroutine FORCE: End Slope = -0.0459899 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (all species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.304532E+01 -2.305517E+01 - --- H2O(L) 1.999600E+00 1.960000E+00 -1.237155E+02 -1.237155E+02 - --- OH- 7.058681E-48 6.362005E-46 -1.967297E+02 -1.922085E+02 - --- Na+ 1.157922E-47 1.245783E-45 -2.087272E+02 -2.040289E+02 - --- H2 1.453013E-48 8.205484E-47 -1.272541E+02 -1.232302E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082001E+02 -5.082100E+02 - --- H+ 1 7.058681E-48 6.362005E-46 -1.052462E+02 -1.007250E+02 -1.782605E+02 -1.692179E+02 - --- H2O 0 4.000000E-04 4.000000E-02 -1.294722E+02 -1.248769E+02 -5.756680E+00 -1.161360E+00 - --- NaCl 0 3.904774E-32 3.905164E-32 -1.745169E+02 -1.745266E+02 -9.999500E-05 -9.850336E-03 - --- Cl- 1 1.157922E-47 1.245783E-45 -1.789653E+02 -1.742670E+02 -2.131757E+02 -2.037791E+02 - --- OH 1 1.745681E-49 2.475807E-47 -2.051430E+02 -2.001982E+02 -1.450545E+02 -1.380978E+02 - --- O2 1 6.828645E-49 3.483790E-47 -1.369656E+02 -1.330433E+02 -1.440427E+02 -1.320726E+02 - --- Norms of Delta G(): 1.408563E+02 1.333393E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.9600000E+00 - --- air = 4.0400000E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2122820993609E+03 - --- Increment counter increased, step is accepted: 5 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Reevaluate major-minor status of noncomponents: - --- Noncomponent turned from minor to major: H2O - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 5, Iterations since last evaluation of optimal basis = 4 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.960e+00 - --- air 2 NA 4.040e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 6.3620E-46 5.3828E-44 -1.6922E+02 | Normal Calc - --- H2O 4.0000E-02 4.6919E-02 -1.1614E+00 | Normal Calc - --- NaCl 3.9052E-32 3.8467E-34 -9.8503E-03 | Normal Calc - --- Cl- 1.2458E-45 1.2693E-43 -2.0378E+02 | Normal Calc - --- OH 2.4758E-47 3.1792E-45 -1.3810E+02 | Normal Calc - --- O2 3.4838E-47 1.7052E-45 -1.3207E+02 | Normal Calc - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 6.3620E-46 5.4464E-44 5.3828E-44 | Normal Major Calc - --- H2O 1 4.0000E-02 8.6919E-02 4.6919E-02 | Normal Major Calc - --- NaCl 0 3.9052E-32 3.9052E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.2458E-45 1.2818E-43 1.2693E-43 | Normal Major Calc - --- OH 1 2.4758E-47 3.2040E-45 3.1792E-45 | Normal Major Calc - --- O2 1 3.4838E-47 1.7401E-45 1.7052E-45 | Normal Major Calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.2693E-43 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9600E+00 1.9131E+00-4.6919E-02 | - --- OH- c 6.3620E-46 5.4464E-44 5.3828E-44 | - --- Na+ c 1.2458E-45 1.2818E-43 1.2693E-43 | - --- H2 c 8.2055E-47 5.0821E-45 5.0000E-45 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2122820993609E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123163220058E+03 - --- subroutine FORCE: Beginning Slope = -0.0544898 - --- subroutine FORCE: End Slope = -0.0186179 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.305517E+01 -2.306672E+01 - --- H2O(L) 1.960000E+00 1.913081E+00 -1.237155E+02 -1.237155E+02 - --- OH- 6.362005E-46 5.446447E-44 -1.922085E+02 -1.877344E+02 - --- Na+ 1.245783E-45 1.281781E-43 -2.040289E+02 -1.993710E+02 - --- H2 8.205484E-47 5.082092E-45 -1.232302E+02 -1.191156E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082100E+02 -5.082215E+02 - --- H+ 1 6.362005E-46 5.446447E-44 -1.007250E+02 -9.625096E+01 -1.692179E+02 -1.602699E+02 - --- H2O 1 4.000000E-02 8.691895E-02 -1.248769E+02 -1.241123E+02 -1.161360E+00 -3.968102E-01 - --- NaCl 0 3.905164E-32 3.905164E-32 -1.745266E+02 -1.745382E+02 -9.850336E-03 -2.139702E-02 - --- Cl- 1 1.245783E-45 1.281781E-43 -1.742670E+02 -1.696091E+02 -2.037791E+02 -1.944634E+02 - --- OH 1 2.475807E-47 3.203980E-45 -2.001982E+02 -1.953468E+02 -1.380978E+02 -1.311891E+02 - --- O2 1 3.483790E-47 1.740051E-45 -1.330433E+02 -1.291439E+02 -1.320726E+02 -1.199441E+02 - --- Norms of Delta G(): 1.333393E+02 1.258966E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.9130811E+00 - --- air = 4.0869189E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2122820993609E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123163220058E+03 - --- Increment counter increased, step is accepted: 6 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 6, Iterations since last evaluation of optimal basis = 5 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.913e+00 - --- air 2 NA 4.087e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 5.4464E-44 4.3645E-42 -1.6027E+02 | Normal Calc - --- H2O 8.6919E-02 3.5240E-02 -3.9681E-01 | Normal Calc - --- NaCl 3.9052E-32 8.3559E-34 -2.1397E-02 | Normal Calc - --- Cl- 1.2818E-43 1.2463E-41 -1.9446E+02 | Normal Calc - --- OH 3.2040E-45 3.6310E-43 -1.3119E+02 | Normal Calc - --- O2 1.7401E-45 8.8079E-44 -1.1994E+02 | Normal Calc - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 5.4464E-44 4.4190E-42 4.3645E-42 | Normal Major Calc - --- H2O 1 8.6919E-02 1.2216E-01 3.5240E-02 | Normal Major Calc - --- NaCl 0 3.9052E-32 3.9052E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.2818E-43 1.2591E-41 1.2463E-41 | Normal Major Calc - --- OH 1 3.2040E-45 3.6630E-43 3.6310E-43 | Normal Major Calc - --- O2 1 1.7401E-45 8.9819E-44 8.8079E-44 | Normal Major Calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.2463E-41 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9131E+00 1.8778E+00-3.5240E-02 | - --- OH- c 5.4464E-44 4.4190E-42 4.3645E-42 | - --- Na+ c 1.2818E-43 1.2591E-41 1.2463E-41 | - --- H2 c 5.0821E-45 3.6279E-43 3.5771E-43 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123163220058E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123241206488E+03 - --- subroutine FORCE: Beginning Slope = -0.0139835 - --- subroutine FORCE: End Slope = -0.00229237 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.306672E+01 -2.307531E+01 - --- H2O(L) 1.913081E+00 1.877841E+00 -1.237155E+02 -1.237155E+02 - --- OH- 5.446447E-44 4.418972E-42 -1.877344E+02 -1.833197E+02 - --- Na+ 1.281781E-43 1.259115E-41 -1.993710E+02 -1.947651E+02 - --- H2 5.082092E-45 3.627901E-43 -1.191156E+02 -1.148561E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082215E+02 -5.082301E+02 - --- H+ 1 5.446447E-44 4.418972E-42 -9.625096E+01 -9.183625E+01 -1.602699E+02 -1.514405E+02 - --- H2O 1 8.691895E-02 1.221587E-01 -1.241123E+02 -1.237806E+02 -3.968102E-01 -6.505054E-02 - --- NaCl 0 3.905164E-32 3.905164E-32 -1.745382E+02 -1.745468E+02 -2.139702E-02 -2.998264E-02 - --- Cl- 1 1.281781E-43 1.259115E-41 -1.696091E+02 -1.650032E+02 -1.944634E+02 -1.852515E+02 - --- OH 1 3.203980E-45 3.663027E-43 -1.953468E+02 -1.906163E+02 -1.311891E+02 -1.243288E+02 - --- O2 1 1.740051E-45 8.981940E-44 -1.291439E+02 -1.252086E+02 -1.199441E+02 -1.074898E+02 - --- Norms of Delta G(): 1.258966E+02 1.185074E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8778413E+00 - --- air = 4.1221587E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123163220058E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123241206488E+03 - --- Increment counter increased, step is accepted: 7 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 7, Iterations since last evaluation of optimal basis = 6 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.878e+00 - --- air 2 NA 4.122e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 4.4190E-42 3.3461E-40 -1.5144E+02 | Normal Calc - --- H2O 1.2216E-01 8.1892E-03 -6.5051E-02 | Normal Calc - --- NaCl 3.9052E-32 1.1709E-33 -2.9983E-02 | Normal Calc - --- Cl- 1.2591E-41 1.1663E-39 -1.8525E+02 | Normal Calc - --- OH 3.6630E-43 3.6363E-41 -1.2433E+02 | Normal Calc - --- O2 8.9819E-44 4.8508E-42 -1.0749E+02 | Normal Calc - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 4.4190E-42 3.3902E-40 3.3461E-40 | Normal Major Calc - --- H2O 1 1.2216E-01 1.3035E-01 8.1892E-03 | Normal Major Calc - --- NaCl 0 3.9052E-32 3.9052E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.2591E-41 1.1789E-39 1.1663E-39 | Normal Major Calc - --- OH 1 3.6630E-43 3.6729E-41 3.6363E-41 | Normal Major Calc - --- O2 1 8.9819E-44 4.9406E-42 4.8508E-42 | Normal Major Calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.1663E-39 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8778E+00 1.8697E+00-8.1892E-03 | - --- OH- c 4.4190E-42 3.3902E-40 3.3461E-40 | - --- Na+ c 1.2591E-41 1.1789E-39 1.1663E-39 | - --- H2 c 3.6279E-43 2.8246E-41 2.7883E-41 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123241206488E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243929345E+03 - --- subroutine FORCE: Beginning Slope = -0.00053271 - --- subroutine FORCE: End Slope = -1.76017e-05 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307531E+01 -2.307729E+01 - --- H2O(L) 1.877841E+00 1.869652E+00 -1.237155E+02 -1.237155E+02 - --- OH- 4.418972E-42 3.390246E-40 -1.833197E+02 -1.789752E+02 - --- Na+ 1.259115E-41 1.178856E-39 -1.947651E+02 -1.902214E+02 - --- H2 3.627901E-43 2.824601E-41 -1.148561E+02 -1.105032E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082301E+02 -5.082321E+02 - --- H+ 1 4.418972E-42 3.390246E-40 -9.183625E+01 -8.749172E+01 -1.514405E+02 -1.427514E+02 - --- H2O 1 1.221587E-01 1.303479E-01 -1.237806E+02 -1.237177E+02 -6.505054E-02 -2.149391E-03 - --- NaCl 0 3.905164E-32 3.905164E-32 -1.745468E+02 -1.745488E+02 -2.998264E-02 -3.196729E-02 - --- Cl- 1 1.259115E-41 1.178856E-39 -1.650032E+02 -1.604595E+02 -1.852515E+02 -1.761642E+02 - --- OH 1 3.663027E-43 3.672948E-41 -1.906163E+02 -1.860104E+02 -1.243288E+02 -1.175465E+02 - --- O2 1 8.981940E-44 4.940635E-42 -1.252086E+02 -1.212031E+02 -1.074898E+02 -9.477851E+01 - --- Norms of Delta G(): 1.185074E+02 1.112144E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8696521E+00 - --- air = 4.1303479E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123241206488E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243929345E+03 - --- Increment counter increased, step is accepted: 8 - --- Normal element abundance check - passed --- Get a new basis because OH is better than comp H2 and share nonzero stoic: 0.5 ----------------------------------------------------------------------------- --- Subroutine BASOPT called to reevaluate the components @@ -919,36 +508,343 @@ VCS CALCULATION METHOD --- NaCl(S) ( 5) remains as component 0 --- N2 ( 4) remains as component 1 - --- H2O(L) ( 1.9) remains as component 2 - --- Na+ ( 1.2e-39) replaces OH- ( 3.4e-40) as component 3 - --- OH- ( 3.4e-40) remains as component 4 - --- OH ( 3.7e-41) replaces H2 ( 2.8e-41) as component 5 + --- H2O(L) ( 2) remains as component 2 + --- Na+ ( 6.5e-25) replaces OH- ( 4.5e-25) as component 3 + --- OH- ( 4.5e-25) remains as component 4 + --- OH ( 1.1e-26) replaces H2 ( 6.6e-27) as component 5 --- CO2 ( 0) remains as component 6 --- Total number of components found = 7 (ne = 11) --- Components: 0 1 2 3 4 5 6 - --- Components Moles: 5 4 1.87 1.18e-39 3.39e-40 3.67e-41 0 + --- Components Moles: 5 4 2 6.52e-25 4.55e-25 1.1e-26 0 --- NonComponent| Moles | NaCl(S) N2 H2O(L) Na+ OH- OH CO2 - --- 7 H+ | 3.39e-40| -0.00 -0.00 -1.00 0.00 1.00 -0.00 0.00 - --- 8 H2O | 0.13| -0.00 -0.00 -1.00 0.00 0.00 -0.00 0.00 - --- 9 NaCl | 3.91e-32| -1.00 -0.00 0.00 0.00 0.00 -0.00 0.00 - --- 10 Cl- | 1.18e-39| -1.00 -0.00 0.00 1.00 0.00 -0.00 0.00 - --- 11 H2 | 2.82e-41| -0.00 -0.00 -2.00 0.00 0.00 2.00 0.00 - --- 12 O2 | 4.94e-42| -0.00 -0.00 2.00 0.00 0.00 -4.00 0.00 + --- 7 H+ | 4.55e-25| -0.00 -0.00 -1.00 0.00 1.00 -0.00 0.00 + --- 8 H2O | 0.0004| -0.00 -0.00 -1.00 0.00 0.00 -0.00 0.00 + --- 9 NaCl | 3.9e-32| -1.00 -0.00 0.00 0.00 0.00 -0.00 0.00 + --- 10 Cl- | 6.52e-25| -1.00 -0.00 0.00 1.00 0.00 -0.00 0.00 + --- 11 H2 | 6.6e-27| -0.00 -0.00 -2.00 0.00 0.00 2.00 0.00 + --- 12 O2 | 5.5e-28| -0.00 -0.00 2.00 0.00 0.00 -4.00 0.00 ----------------------------------------------------------------------------- --- Subroutine vcs_deltag called for all noncomponents --- Species Status decision is reavaluated: All species are minor except for: + --- Major Species : NaCl(S) + --- Major Species : N2 + --- Major Species : H2O(L) + --- Major Species : Na+ + --- Major Species : OH- + --- Major Species : OH + --- CO2 can not be nonzero because needed element C is zero + --- Zeroed Species in an active MS phase (Stoich Constraint): CO2 --- Major Species : H+ - --- Major Species : H2O --- Major Species : Cl- --- Major Species : H2 --- Major Species : O2 --- --- Element Abundance check passed + +============================================================================================================== + Iteration = 2, Iterations since last evaluation of optimal basis = 0 (all species) + --- vcs_popPhaseID() called + --- Phase Status F_e MoleNum + -------------------------------------------------------------- + --- NaCl_electrolyte 2 NA 2.000e+00 + --- air 2 NA 4.000e+00 + --- NaCl(S) 2 NA 5.000e+00 + -------------------------------------------------------------- + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H+ 4.5466E-25 1.6645E-23 -7.3221E+01 | Normal calc: diag adjusted from 4.39892e+24 to 4.39892e+24 due to act coeff + --- H2O 4.0000E-04 2.3029E-03 -5.7567E+00 | Normal Calc + --- NaCl 3.9048E-32 3.9046E-36 -9.9995E-05 | Normal Calc + --- Cl- 6.5214E-25 3.5347E-23 -1.0841E+02 | Normal calc: diag adjusted from 3.06684e+24 to 3.06684e+24 due to act coeff + --- H2 6.6000E-27 2.6254E-25 -1.3525E+02 | Normal Calc + --- O2 5.5000E-28 -5.5000E-28 2.7432E+02 | Delta damped from -8.38208e-26 to -5.5e-28 due to O2 going negative + ---------------------------------------------------------------------------------- + --- Main Loop Treatment of each non-component species - Full Calculation: + --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment + --- H+ 1 4.5466E-25 1.7100E-23 1.6645E-23 | Normal Major Calc + --- H2O 0 4.0000E-04 4.0000E-02 3.9600E-02 | minor species alternative calc + --- NaCl 0 3.9048E-32 3.9052E-32 3.9048E-36 | minor species alternative calc + --- Cl- 1 6.5214E-25 3.6000E-23 3.5347E-23 | Normal Major Calc + --- H2 1 6.6000E-27 2.6914E-25 2.6254E-25 | Normal Major Calc + --- O2 1 5.5000E-28 5.5000E-29-4.9500E-28 | initial nonpos kmoles= 0.000E+00 + --- NaCl(S) c 5.0000E+00 5.0000E+00-3.5347E-23 | + --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | + --- H2O(L) c 1.9996E+00 1.9600E+00-3.9600E-02 | + --- Na+ c 6.5214E-25 3.6000E-23 3.5347E-23 | + --- OH- c 4.5466E-25 1.7100E-23 1.6645E-23 | + --- OH c 1.1000E-26 5.3805E-25 5.2705E-25 | + --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | + -------------------------------------------------------------------------------- + --- Finished Main Loop + --- Subroutine vcs_dfe called for all species using tentative solution + --- Subroutine vcs_deltag called for all noncomponents + --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2122820993609E+03 + --- subroutine FORCE: Beginning Slope = -0.227965 + --- subroutine FORCE: End Slope = -0.0459899 + --- subroutine FORCE produced no adjustments, s2 < 0 + ------------------------------------------------------------------------------------------------------- + --- Summary of the Update (all species): + --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT + --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.304532E+01 -2.305517E+01 + --- H2O(L) 1.999600E+00 1.960000E+00 -1.237155E+02 -1.237155E+02 + --- Na+ 6.521361E-25 3.599957E-23 -1.563419E+02 -1.523109E+02 + --- OH- 4.546575E-25 1.709997E-23 -1.442101E+02 -1.405629E+02 + --- OH 1.100000E-26 5.380528E-25 -1.526453E+02 -1.487651E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082001E+02 -5.082100E+02 + --- H+ 1 4.546575E-25 1.709997E-23 -5.272667E+01 -4.907938E+01 -7.322130E+01 -6.592672E+01 + --- H2O 0 4.000000E-04 4.000000E-02 -1.294722E+02 -1.248769E+02 -5.756680E+00 -1.161360E+00 + --- NaCl 0 3.904774E-32 3.905164E-32 -1.745169E+02 -1.745266E+02 -9.999499E-05 -9.850336E-03 + --- Cl- 1 6.521361E-25 3.599957E-23 -1.265800E+02 -1.225490E+02 -1.084051E+02 -1.003431E+02 + --- H2 1 6.600000E-27 2.691364E-25 -7.738635E+01 -7.368805E+01 -1.352460E+02 -1.237873E+02 + --- O2 1 5.500000E-28 5.500000E-29 -8.882770E+01 -9.114013E+01 2.743227E+02 2.564894E+02 + --- Norms of Delta G(): 1.358250E+02 1.261788E+02 + --- Phase_Name KMoles(after update) + --- -------------------------------------------------- + --- NaCl_electrolyte = 1.9600000E+00 + --- air = 4.0400000E+00 + --- NaCl(S) = 5.0000000E+00 + ------------------------------------------------------------------------------------------------------- + --- Total Old Dimensionless Gibbs Free Energy = -1.2121985462840E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2122820993609E+03 + --- Increment counter increased, step is accepted: 3 + --- Normal element abundance check - passed + --- Check for an optimum basis passed + --- Reevaluate major-minor status of noncomponents: + --- Noncomponent turned from minor to major: H2O + --- Noncomponent turned from major to minor: O2 + --- Equilibrium check for major species: H+ failed + +============================================================================================================== + Iteration = 3, Iterations since last evaluation of optimal basis = 1 (only major species) + --- vcs_popPhaseID() called + --- Phase Status F_e MoleNum + -------------------------------------------------------------- + --- NaCl_electrolyte 2 NA 1.960e+00 + --- air 2 NA 4.040e+00 + --- NaCl(S) 2 NA 5.000e+00 + -------------------------------------------------------------- + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H+ 1.7100E-23 5.6367E-22 -6.5927E+01 | Normal calc: diag adjusted from 1.16959e+23 to 1.16959e+23 due to act coeff + --- H2O 4.0000E-02 4.6919E-02 -1.1614E+00 | Normal Calc + --- NaCl 3.9052E-32 3.8467E-34 -9.8503E-03 | Normal Calc + --- Cl- 3.6000E-23 1.8062E-21 -1.0034E+02 | Normal calc: diag adjusted from 5.55562e+22 to 5.55562e+22 due to act coeff + --- H2 2.6914E-25 1.1102E-23 -1.2379E+02 | Normal Calc + --- O2 5.5000E-29 0.0000E+00 2.5649E+02 | Skipped: IC = 0 and DG >0: 2.565E+02 + ---------------------------------------------------------------------------------- + --- Main Loop Treatment of each non-component species - Major Components Calculation: + --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment + --- H+ 1 1.7100E-23 5.8077E-22 5.6367E-22 | Normal Major Calc + --- H2O 1 4.0000E-02 8.6919E-02 4.6919E-02 | Normal Major Calc + --- NaCl 0 3.9052E-32 3.9052E-32 0.0000E+00 | minor species not considered + --- Cl- 1 3.6000E-23 1.8422E-21 1.8062E-21 | Normal Major Calc + --- H2 1 2.6914E-25 1.1371E-23 1.1102E-23 | Normal Major Calc + --- O2 0 5.5000E-29 5.5000E-29 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-1.8062E-21 | + --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | + --- H2O(L) c 1.9600E+00 1.9131E+00-4.6919E-02 | + --- Na+ c 3.6000E-23 1.8422E-21 1.8062E-21 | + --- OH- c 1.7100E-23 5.8077E-22 5.6367E-22 | + --- OH c 5.3805E-25 2.2742E-23 2.2204E-23 | + --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | + -------------------------------------------------------------------------------- + --- Finished Main Loop + --- Subroutine vcs_dfe called for all species using tentative solution + --- Subroutine vcs_deltag called for all noncomponents + --- Total Old Dimensionless Gibbs Free Energy = -1.2122820993609E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123163220058E+03 + --- subroutine FORCE: Beginning Slope = -0.0544898 + --- subroutine FORCE: End Slope = -0.0186179 + --- subroutine FORCE produced no adjustments, s2 < 0 + ------------------------------------------------------------------------------------------------------- + --- Summary of the Update (only major species): + --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT + --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.305517E+01 -2.306672E+01 + --- H2O(L) 1.960000E+00 1.913081E+00 -1.237155E+02 -1.237155E+02 + --- Na+ 3.599957E-23 1.842153E-21 -1.523109E+02 -1.483514E+02 + --- OH- 1.709997E-23 5.807723E-22 -1.405629E+02 -1.370133E+02 + --- OH 5.380528E-25 2.274244E-23 -1.487651E+02 -1.450326E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082100E+02 -5.082215E+02 + --- H+ 1 1.709997E-23 5.807723E-22 -4.907938E+01 -4.552986E+01 -6.592672E+01 -5.882770E+01 + --- H2O 1 4.000000E-02 8.691895E-02 -1.248769E+02 -1.241123E+02 -1.161360E+00 -3.968102E-01 + --- NaCl 0 3.905164E-32 3.905164E-32 -1.745266E+02 -1.745382E+02 -9.850336E-03 -2.139702E-02 + --- Cl- 1 3.599957E-23 1.842153E-21 -1.225490E+02 -1.185896E+02 -1.003431E+02 -9.242424E+01 + --- H2 1 2.691364E-25 1.137133E-23 -7.368805E+01 -6.995596E+01 -1.237873E+02 -1.125902E+02 + --- O2 0 5.500000E-29 5.500000E-29 -9.114013E+01 -9.115168E+01 2.564894E+02 2.415479E+02 + --- Norms of Delta G(): 1.261788E+02 1.176329E+02 + --- Phase_Name KMoles(after update) + --- -------------------------------------------------- + --- NaCl_electrolyte = 1.9130811E+00 + --- air = 4.0869189E+00 + --- NaCl(S) = 5.0000000E+00 + ------------------------------------------------------------------------------------------------------- + --- Total Old Dimensionless Gibbs Free Energy = -1.2122820993609E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123163220058E+03 + --- Increment counter increased, step is accepted: 4 + --- Normal element abundance check - passed + --- Check for an optimum basis passed + --- Equilibrium check for major species: H+ failed + +============================================================================================================== + Iteration = 4, Iterations since last evaluation of optimal basis = 2 (only major species) + --- vcs_popPhaseID() called + --- Phase Status F_e MoleNum + -------------------------------------------------------------- + --- NaCl_electrolyte 2 NA 1.913e+00 + --- air 2 NA 4.087e+00 + --- NaCl(S) 2 NA 5.000e+00 + -------------------------------------------------------------- + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H+ 5.8077E-22 1.7083E-20 -5.8828E+01 | Normal calc: diag adjusted from 3.44369e+21 to 3.44369e+21 due to act coeff + --- H2O 8.6919E-02 3.5240E-02 -3.9681E-01 | Normal Calc + --- NaCl 3.9052E-32 8.3559E-34 -2.1397E-02 | Normal Calc + --- Cl- 1.8422E-21 8.5130E-20 -9.2424E+01 | Normal calc: diag adjusted from 1.08569e+21 to 1.08569e+21 due to act coeff + --- H2 1.1371E-23 4.2676E-22 -1.1259E+02 | Normal Calc + --- O2 5.5000E-29 0.0000E+00 2.4155E+02 | Skipped: IC = 0 and DG >0: 2.415E+02 + ---------------------------------------------------------------------------------- + --- Main Loop Treatment of each non-component species - Major Components Calculation: + --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment + --- H+ 1 5.8077E-22 1.7664E-20 1.7083E-20 | Normal Major Calc + --- H2O 1 8.6919E-02 1.2216E-01 3.5240E-02 | Normal Major Calc + --- NaCl 0 3.9052E-32 3.9052E-32 0.0000E+00 | minor species not considered + --- Cl- 1 1.8422E-21 8.6972E-20 8.5130E-20 | Normal Major Calc + --- H2 1 1.1371E-23 4.3814E-22 4.2676E-22 | Normal Major Calc + --- O2 0 5.5000E-29 5.5000E-29 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-8.5130E-20 | + --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | + --- H2O(L) c 1.9131E+00 1.8778E+00-3.5240E-02 | + --- Na+ c 1.8422E-21 8.6972E-20 8.5130E-20 | + --- OH- c 5.8077E-22 1.7664E-20 1.7083E-20 | + --- OH c 2.2742E-23 8.7627E-22 8.5353E-22 | + --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | + -------------------------------------------------------------------------------- + --- Finished Main Loop + --- Subroutine vcs_dfe called for all species using tentative solution + --- Subroutine vcs_deltag called for all noncomponents + --- Total Old Dimensionless Gibbs Free Energy = -1.2123163220058E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123241206488E+03 + --- subroutine FORCE: Beginning Slope = -0.0139835 + --- subroutine FORCE: End Slope = -0.00229237 + --- subroutine FORCE produced no adjustments, s2 < 0 + ------------------------------------------------------------------------------------------------------- + --- Summary of the Update (only major species): + --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT + --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.306672E+01 -2.307531E+01 + --- H2O(L) 1.913081E+00 1.877841E+00 -1.237155E+02 -1.237155E+02 + --- Na+ 1.842153E-21 8.697195E-20 -1.483514E+02 -1.444782E+02 + --- OH- 5.807723E-22 1.766352E-20 -1.370133E+02 -1.335799E+02 + --- OH 2.274244E-23 8.762709E-22 -1.450326E+02 -1.413898E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082215E+02 -5.082301E+02 + --- H+ 1 5.807723E-22 1.766352E-20 -4.552986E+01 -4.209637E+01 -5.882770E+01 -5.196072E+01 + --- H2O 1 8.691895E-02 1.221587E-01 -1.241123E+02 -1.237806E+02 -3.968102E-01 -6.505054E-02 + --- NaCl 0 3.905164E-32 3.905164E-32 -1.745382E+02 -1.745468E+02 -2.139702E-02 -2.998264E-02 + --- Cl- 1 1.842153E-21 8.697195E-20 -1.185896E+02 -1.147163E+02 -9.242424E+01 -8.467775E+01 + --- H2 1 1.137133E-23 4.381355E-22 -6.995596E+01 -6.631312E+01 -1.125902E+02 -1.016617E+02 + --- O2 0 5.500000E-29 5.500000E-29 -9.115168E+01 -9.116027E+01 2.415479E+02 2.269679E+02 + --- Norms of Delta G(): 1.176329E+02 1.093311E+02 + --- Phase_Name KMoles(after update) + --- -------------------------------------------------- + --- NaCl_electrolyte = 1.8778413E+00 + --- air = 4.1221587E+00 + --- NaCl(S) = 5.0000000E+00 + ------------------------------------------------------------------------------------------------------- + --- Total Old Dimensionless Gibbs Free Energy = -1.2123163220058E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123241206488E+03 + --- Increment counter increased, step is accepted: 5 + --- Normal element abundance check - passed + --- Check for an optimum basis passed + --- Equilibrium check for major species: H+ failed --- Subroutine vcs_dfe called for components and minors --- Subroutine vcs_deltag called for minor noncomponents ============================================================================================================== - Iteration = 8, Iterations since last evaluation of optimal basis = 0 (all species) + Iteration = 5, Iterations since last evaluation of optimal basis = 3 (all species) + --- vcs_popPhaseID() called + --- Phase Status F_e MoleNum + -------------------------------------------------------------- + --- NaCl_electrolyte 2 NA 1.878e+00 + --- air 2 NA 4.122e+00 + --- NaCl(S) 2 NA 5.000e+00 + -------------------------------------------------------------- + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H+ 1.7664E-20 4.5890E-19 -5.1961E+01 | Normal calc: diag adjusted from 1.13228e+20 to 1.13228e+20 due to act coeff + --- H2O 1.2216E-01 8.1892E-03 -6.5051E-02 | Normal Calc + --- NaCl 3.9052E-32 1.1709E-33 -2.9983E-02 | Normal Calc + --- Cl- 8.6972E-20 3.6823E-18 -8.4678E+01 | Normal calc: diag adjusted from 2.29959e+19 to 2.29959e+19 due to act coeff + --- H2 4.3814E-22 1.4847E-20 -1.0166E+02 | Normal Calc + --- O2 5.5000E-29 0.0000E+00 2.2697E+02 | Skipped: IC = 0 and DG >0: 2.270E+02 + ---------------------------------------------------------------------------------- + --- Main Loop Treatment of each non-component species - Full Calculation: + --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment + --- H+ 1 1.7664E-20 4.7657E-19 4.5890E-19 | Normal Major Calc + --- H2O 1 1.2216E-01 1.3035E-01 8.1892E-03 | Normal Major Calc + --- NaCl 0 3.9052E-32 4.0240E-32 1.1886E-33 | minor species alternative calc + --- Cl- 1 8.6972E-20 3.7693E-18 3.6823E-18 | Normal Major Calc + --- H2 1 4.3814E-22 1.5285E-20 1.4847E-20 | Normal Major Calc + --- O2 0 5.5000E-29 5.5000E-39-5.5000E-29 | minor species alternative calc + --- NaCl(S) c 5.0000E+00 5.0000E+00-3.6823E-18 | + --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | + --- H2O(L) c 1.8778E+00 1.8697E+00-8.1892E-03 | + --- Na+ c 8.6972E-20 3.7693E-18 3.6823E-18 | + --- OH- c 1.7664E-20 4.7657E-19 4.5890E-19 | + --- OH c 8.7627E-22 3.0571E-20 2.9694E-20 | + --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | + -------------------------------------------------------------------------------- + --- Finished Main Loop + --- Subroutine vcs_dfe called for all species using tentative solution + --- Subroutine vcs_deltag called for all noncomponents + --- Total Old Dimensionless Gibbs Free Energy = -1.2123241206488E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243929345E+03 + --- subroutine FORCE: Beginning Slope = -0.00053271 + --- subroutine FORCE: End Slope = -1.76017e-05 + --- subroutine FORCE produced no adjustments, s2 < 0 + ------------------------------------------------------------------------------------------------------- + --- Summary of the Update (all species): + --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT + --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307531E+01 -2.307729E+01 + --- H2O(L) 1.877841E+00 1.869652E+00 -1.237155E+02 -1.237155E+02 + --- Na+ 8.697195E-20 3.769267E-18 -1.444782E+02 -1.407048E+02 + --- OH- 1.766352E-20 4.765682E-19 -1.335799E+02 -1.302804E+02 + --- OH 8.762709E-22 3.057066E-20 -1.413898E+02 -1.378397E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082301E+02 -5.082321E+02 + --- H+ 1 1.766352E-20 4.765682E-19 -4.209637E+01 -3.879689E+01 -5.196072E+01 -4.536176E+01 + --- H2O 1 1.221587E-01 1.303479E-01 -1.237806E+02 -1.237177E+02 -6.505054E-02 -2.149391E-03 + --- NaCl 0 3.905164E-32 4.024024E-32 -1.745468E+02 -1.745188E+02 -2.998264E-02 -1.984652E-03 + --- Cl- 1 8.697195E-20 3.769267E-18 -1.147163E+02 -1.109429E+02 -8.467775E+01 -7.713091E+01 + --- H2 1 4.381355E-22 1.528533E-20 -6.631312E+01 -6.276298E+01 -1.016617E+02 -9.101127E+01 + --- O2 0 5.500000E-29 5.499996E-39 -9.116027E+01 -1.141881E+02 2.269679E+02 1.897395E+02 + --- Norms of Delta G(): 1.093311E+02 9.335505E+01 + --- Phase_Name KMoles(after update) + --- -------------------------------------------------- + --- NaCl_electrolyte = 1.8696521E+00 + --- air = 4.1303479E+00 + --- NaCl(S) = 5.0000000E+00 + ------------------------------------------------------------------------------------------------------- + --- Total Old Dimensionless Gibbs Free Energy = -1.2123241206488E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123243929345E+03 + --- Increment counter increased, step is accepted: 6 + --- Normal element abundance check - passed + --- Check for an optimum basis passed + --- Reevaluate major-minor status of noncomponents: + --- Equilibrium check for major species: H+ failed + +============================================================================================================== + Iteration = 6, Iterations since last evaluation of optimal basis = 4 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -960,27 +856,27 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 3.3902E-40 2.4198E-38 -1.4275E+02 | Normal Calc + --- H+ 4.7657E-19 1.0809E-17 -4.5362E+01 | Normal calc: diag adjusted from 4.19667e+18 to 4.19667e+18 due to act coeff --- H2O 1.3035E-01 2.8930E-04 -2.1494E-03 | Normal Calc - --- NaCl 3.9052E-32 1.2484E-33 -3.1967E-02 | Normal Calc - --- Cl- 1.1789E-39 1.0384E-37 -1.7616E+02 | Normal Calc - --- H2 2.8246E-41 1.6291E-39 -2.3509E+02 | Normal Calc - --- O2 4.9406E-42 -4.9406E-42 3.7541E+02 | Delta damped from -5.88394e-40 to -4.94064e-42 due to O2 going negative + --- NaCl 4.0240E-32 7.9863E-35 -1.9847E-03 | Normal Calc + --- Cl- 3.7693E-18 1.4536E-16 -7.7131E+01 | Normal calc: diag adjusted from 5.30607e+17 to 5.30607e+17 due to act coeff + --- H2 1.5285E-20 4.6371E-19 -9.1011E+01 | Normal Calc + --- O2 5.5000E-39 0.0000E+00 1.8974E+02 | Skipped: IC = 0 and DG >0: 1.897E+02 ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Full Calculation: + --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 3.3902E-40 2.4537E-38 2.4198E-38 | Normal Major Calc + --- H+ 1 4.7657E-19 1.1286E-17 1.0809E-17 | Normal Major Calc --- H2O 1 1.3035E-01 1.3064E-01 2.8930E-04 | Normal Major Calc - --- NaCl 0 3.9052E-32 4.0320E-32 1.2685E-33 | minor species alternative calc - --- Cl- 1 1.1789E-39 1.0501E-37 1.0384E-37 | Normal Major Calc - --- H2 1 2.8246E-41 1.6574E-39 1.6291E-39 | Normal Major Calc - --- O2 1 4.9406E-42 4.9406E-43-4.4466E-42 | initial nonpos kmoles= 0.000E+00 - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.2686E-33 | + --- NaCl 0 4.0240E-32 4.0240E-32 0.0000E+00 | minor species not considered + --- Cl- 1 3.7693E-18 1.4913E-16 1.4536E-16 | Normal Major Calc + --- H2 1 1.5285E-20 4.7900E-19 4.6371E-19 | Normal Major Calc + --- O2 0 5.5000E-39 5.5000E-39 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-1.4536E-16 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | --- H2O(L) c 1.8697E+00 1.8694E+00-2.8930E-04 | - --- Na+ c 1.1789E-39 1.0501E-37 1.0384E-37 | - --- OH- c 3.3902E-40 2.4537E-38 2.4198E-38 | - --- OH c 3.6729E-41 3.3127E-39 3.2760E-39 | + --- Na+ c 3.7693E-18 1.4913E-16 1.4536E-16 | + --- OH- c 4.7657E-19 1.1286E-17 1.0809E-17 | + --- OH c 3.0571E-20 9.5800E-19 9.2742E-19 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -989,25 +885,25 @@ VCS CALCULATION METHOD --- Total Old Dimensionless Gibbs Free Energy = -1.2123243929345E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 --- subroutine FORCE: Beginning Slope = -6.21815e-07 - --- subroutine FORCE: End Slope = -7.10763e-10 + --- subroutine FORCE: End Slope = -7.10774e-10 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (all species): + --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307729E+01 -2.307736E+01 --- H2O(L) 1.869652E+00 1.869363E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 1.178856E-39 1.050149E-37 -1.902214E+02 -1.857317E+02 - --- OH- 3.390246E-40 2.453715E-38 -1.789752E+02 -1.746932E+02 - --- OH 3.672948E-41 3.312737E-39 -1.860104E+02 -1.815085E+02 + --- Na+ 3.769267E-18 1.491328E-16 -1.407048E+02 -1.370267E+02 + --- OH- 4.765682E-19 1.128556E-17 -1.302804E+02 -1.271156E+02 + --- OH 3.057066E-20 9.579955E-19 -1.378397E+02 -1.343949E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082321E+02 -5.082322E+02 - --- H+ 1 3.390246E-40 2.453715E-38 -8.749172E+01 -8.320969E+01 -1.427514E+02 -1.341874E+02 + --- H+ 1 4.765682E-19 1.128556E-17 -3.879689E+01 -3.563207E+01 -4.536176E+01 -3.903212E+01 --- H2O 1 1.303479E-01 1.306372E-01 -1.237177E+02 -1.237155E+02 -2.149391E-03 -2.456850E-06 - --- NaCl 0 3.905164E-32 4.032019E-32 -1.745488E+02 -1.745169E+02 -3.196729E-02 -7.003970E-05 - --- Cl- 1 1.178856E-39 1.050149E-37 -1.604595E+02 -1.559698E+02 -1.761642E+02 -1.671847E+02 - --- H2 1 2.824601E-41 1.657356E-39 -1.105032E+02 -1.064313E+02 -2.350930E+02 -2.220173E+02 - --- O2 1 4.940635E-42 4.940635E-43 -1.212031E+02 -1.235058E+02 3.754075E+02 3.550973E+02 - --- Norms of Delta G(): 2.031466E+02 1.920689E+02 + --- NaCl 0 4.024024E-32 4.024024E-32 -1.745188E+02 -1.745188E+02 -1.984652E-03 -2.054692E-03 + --- Cl- 1 3.769267E-18 1.491328E-16 -1.109429E+02 -1.072648E+02 -7.713091E+01 -6.977469E+01 + --- H2 1 1.528533E-20 4.789978E-19 -6.276298E+01 -5.931825E+01 -9.101127E+01 -8.067707E+01 + --- O2 0 5.499996E-39 5.499996E-39 -1.141881E+02 -1.141882E+02 1.897395E+02 1.759605E+02 + --- Norms of Delta G(): 9.335505E+01 8.550136E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 1.8693628E+00 @@ -1016,15 +912,13 @@ VCS CALCULATION METHOD ------------------------------------------------------------------------------------------------------- --- Total Old Dimensionless Gibbs Free Energy = -1.2123243929345E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 9 + --- Increment counter increased, step is accepted: 7 --- Normal element abundance check - passed --- Check for an optimum basis passed - --- Reevaluate major-minor status of noncomponents: - --- Noncomponent turned from major to minor: O2 --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 9, Iterations since last evaluation of optimal basis = 1 (only major species) + Iteration = 7, Iterations since last evaluation of optimal basis = 5 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -1036,27 +930,27 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 2.4537E-38 1.6463E-36 -1.3419E+02 | Normal Calc + --- H+ 1.1286E-17 2.2025E-16 -3.9032E+01 | Normal calc: diag adjusted from 1.77218e+17 to 1.77218e+17 due to act coeff --- H2O 1.3064E-01 3.3144E-07 -2.4569E-06 | Normal Calc - --- NaCl 4.0320E-32 2.8240E-36 -7.0040E-05 | Normal Calc - --- Cl- 1.0501E-37 8.7784E-36 -1.6718E+02 | Normal Calc - --- H2 1.6574E-39 1.2261E-37 -2.2202E+02 | Normal Calc - --- O2 4.9406E-43 0.0000E+00 3.5510E+02 | Skipped: IC = 0 and DG >0: 3.551E+02 + --- NaCl 4.0240E-32 8.2681E-35 -2.0547E-03 | Normal Calc + --- Cl- 1.4913E-16 5.2028E-15 -6.9775E+01 | Normal calc: diag adjusted from 1.34109e+16 to 1.34109e+16 due to act coeff + --- H2 4.7900E-19 1.2881E-17 -8.0677E+01 | Normal Calc + --- O2 5.5000E-39 0.0000E+00 1.7596E+02 | Skipped: IC = 0 and DG >0: 1.760E+02 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 2.4537E-38 1.6708E-36 1.6463E-36 | Normal Major Calc + --- H+ 1 1.1286E-17 2.3154E-16 2.2025E-16 | Normal Major Calc --- H2O 1 1.3064E-01 1.3064E-01 3.3144E-07 | Normal Major Calc - --- NaCl 0 4.0320E-32 4.0320E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.0501E-37 8.8835E-36 8.7784E-36 | Normal Major Calc - --- H2 1 1.6574E-39 1.2426E-37 1.2261E-37 | Normal Major Calc - --- O2 0 4.9406E-43 4.9406E-43 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-8.7784E-36 | + --- NaCl 0 4.0240E-32 4.0240E-32 0.0000E+00 | minor species not considered + --- Cl- 1 1.4913E-16 5.3520E-15 5.2028E-15 | Normal Major Calc + --- H2 1 4.7900E-19 1.3360E-17 1.2881E-17 | Normal Major Calc + --- O2 0 5.5000E-39 5.5000E-39 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-5.2028E-15 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | --- H2O(L) c 1.8694E+00 1.8694E+00-3.3144E-07 | - --- Na+ c 1.0501E-37 8.8835E-36 8.7784E-36 | - --- OH- c 2.4537E-38 1.6708E-36 1.6463E-36 | - --- OH c 3.3127E-39 2.4852E-37 2.4521E-37 | + --- Na+ c 1.4913E-16 5.3520E-15 5.2028E-15 | + --- OH- c 1.1286E-17 2.3154E-16 2.2025E-16 | + --- OH c 9.5800E-19 2.6721E-17 2.5763E-17 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -1064,8 +958,8 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -8.14294e-13 - --- subroutine FORCE: End Slope = -1.06446e-18 + --- subroutine FORCE: Beginning Slope = -1.18696e-12 + --- subroutine FORCE: End Slope = -3.33948e-13 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): @@ -1073,17 +967,17 @@ VCS CALCULATION METHOD --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 --- H2O(L) 1.869363E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 1.050149E-37 8.883461E-36 -1.857317E+02 -1.812938E+02 - --- OH- 2.453715E-38 1.670825E-36 -1.746932E+02 -1.704723E+02 - --- OH 3.312737E-39 2.485230E-37 -1.815085E+02 -1.771908E+02 + --- Na+ 1.491328E-16 5.351979E-15 -1.370267E+02 -1.334463E+02 + --- OH- 1.128556E-17 2.315351E-16 -1.271156E+02 -1.240943E+02 + --- OH 9.579955E-19 2.672075E-17 -1.343949E+02 -1.310666E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 2.453715E-38 1.670825E-36 -8.320969E+01 -7.898881E+01 -1.341874E+02 -1.257456E+02 + --- H+ 1 1.128556E-17 2.315351E-16 -3.563207E+01 -3.261086E+01 -3.903212E+01 -3.298970E+01 --- H2O 1 1.306372E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -2.456850E-06 -3.211653E-12 - --- NaCl 0 4.032019E-32 4.032019E-32 -1.745169E+02 -1.745169E+02 -7.003970E-05 -7.011994E-05 - --- Cl- 1 1.050149E-37 8.883461E-36 -1.559698E+02 -1.515320E+02 -1.671847E+02 -1.583090E+02 - --- H2 1 1.657356E-39 1.242625E-37 -1.064313E+02 -1.021141E+02 -2.220173E+02 -2.090646E+02 - --- O2 0 4.940635E-43 4.940635E-43 -1.235058E+02 -1.235058E+02 3.550973E+02 3.378263E+02 - --- Norms of Delta G(): 1.920689E+02 1.819836E+02 + --- NaCl 0 4.024024E-32 4.024024E-32 -1.745188E+02 -1.745188E+02 -2.054692E-03 -2.054772E-03 + --- Cl- 1 1.491328E-16 5.351979E-15 -1.072648E+02 -1.036844E+02 -6.977469E+01 -6.261392E+01 + --- H2 1 4.789978E-19 1.336038E-17 -5.931825E+01 -5.598989E+01 -8.067707E+01 -7.069201E+01 + --- O2 0 5.499996E-39 5.499996E-39 -1.141882E+02 -1.141882E+02 1.759605E+02 1.626471E+02 + --- Norms of Delta G(): 8.550136E+01 7.795325E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 1.8693625E+00 @@ -1092,13 +986,13 @@ VCS CALCULATION METHOD ------------------------------------------------------------------------------------------------------- --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 10 + --- Increment counter increased, step is accepted: 8 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 10, Iterations since last evaluation of optimal basis = 2 (only major species) + Iteration = 8, Iterations since last evaluation of optimal basis = 6 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -1110,27 +1004,27 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.6708E-36 1.0505E-34 -1.2575E+02 | Normal Calc + --- H+ 2.3154E-16 3.8191E-15 -3.2990E+01 | Normal calc: diag adjusted from 8.638e+15 to 8.638e+15 due to act coeff --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0320E-32 2.8272E-36 -7.0120E-05 | Normal Calc - --- Cl- 8.8835E-36 7.0317E-34 -1.5831E+02 | Normal Calc - --- H2 1.2426E-37 8.6596E-36 -2.0906E+02 | Normal Calc - --- O2 4.9406E-43 0.0000E+00 3.3783E+02 | Skipped: IC = 0 and DG >0: 3.378E+02 + --- NaCl 4.0240E-32 8.2685E-35 -2.0548E-03 | Normal Calc + --- Cl- 5.3520E-15 1.6755E-13 -6.2614E+01 | Normal calc: diag adjusted from 3.73694e+14 to 3.73693e+14 due to act coeff + --- H2 1.3360E-17 3.1482E-16 -7.0692E+01 | Normal Calc + --- O2 5.5000E-39 0.0000E+00 1.6265E+02 | Skipped: IC = 0 and DG >0: 1.626E+02 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.6708E-36 1.0672E-34 1.0505E-34 | Normal Major Calc + --- H+ 1 2.3154E-16 4.0507E-15 3.8191E-15 | Normal Major Calc --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0320E-32 4.0320E-32 0.0000E+00 | minor species not considered - --- Cl- 1 8.8835E-36 7.1205E-34 7.0317E-34 | Normal Major Calc - --- H2 1 1.2426E-37 8.7838E-36 8.6596E-36 | Normal Major Calc - --- O2 0 4.9406E-43 4.9406E-43 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-7.0317E-34 | + --- NaCl 0 4.0240E-32 4.0240E-32 0.0000E+00 | minor species not considered + --- Cl- 1 5.3520E-15 1.7291E-13 1.6755E-13 | Normal Major Calc + --- H2 1 1.3360E-17 3.2818E-16 3.1482E-16 | Normal Major Calc + --- O2 0 5.5000E-39 5.5000E-39 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-1.6755E-13 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-1.2237E-34 | - --- Na+ c 8.8835E-36 7.1205E-34 7.0317E-34 | - --- OH- c 1.6708E-36 1.0672E-34 1.0505E-34 | - --- OH c 2.4852E-37 1.7568E-35 1.7319E-35 | + --- H2O(L) c 1.8694E+00 1.8694E+00-4.4488E-15 | + --- Na+ c 5.3520E-15 1.7291E-13 1.6755E-13 | + --- OH- c 2.3154E-16 4.0507E-15 3.8191E-15 | + --- OH c 2.6721E-17 6.5637E-16 6.2965E-16 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -1138,8 +1032,8 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -1.26337e-31 - --- subroutine FORCE: End Slope = -1.19188e-31 + --- subroutine FORCE: Beginning Slope = -1.06395e-11 + --- subroutine FORCE: End Slope = -9.44999e-12 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): @@ -1147,17 +1041,17 @@ VCS CALCULATION METHOD --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 8.883461E-36 7.120495E-34 -1.812938E+02 -1.769099E+02 - --- OH- 1.670825E-36 1.067202E-34 -1.704723E+02 -1.663154E+02 - --- OH 2.485230E-37 1.756769E-35 -1.771908E+02 -1.729325E+02 + --- Na+ 5.351979E-15 1.729062E-13 -1.334463E+02 -1.299710E+02 + --- OH- 2.315351E-16 4.050672E-15 -1.240943E+02 -1.212324E+02 + --- OH 2.672075E-17 6.563687E-16 -1.310666E+02 -1.278653E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.670825E-36 1.067202E-34 -7.898881E+01 -7.483192E+01 -1.257456E+02 -1.174318E+02 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032019E-32 4.032019E-32 -1.745169E+02 -1.745169E+02 -7.011994E-05 -7.011994E-05 - --- Cl- 1 8.883461E-36 7.120495E-34 -1.515320E+02 -1.471480E+02 -1.583090E+02 -1.495411E+02 - --- H2 1 1.242625E-37 8.783847E-36 -1.021141E+02 -9.785580E+01 -2.090646E+02 -1.962897E+02 - --- O2 0 4.940635E-43 4.940635E-43 -1.235058E+02 -1.235058E+02 3.378263E+02 3.207931E+02 - --- Norms of Delta G(): 1.819836E+02 1.720420E+02 + --- H+ 1 2.315351E-16 4.050672E-15 -3.261086E+01 -2.974896E+01 -3.298970E+01 -2.726589E+01 + --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.026912E-12 + --- NaCl 0 4.024024E-32 4.024024E-32 -1.745188E+02 -1.745188E+02 -2.054772E-03 -2.054772E-03 + --- Cl- 1 5.351979E-15 1.729062E-13 -1.036844E+02 -1.002091E+02 -6.261392E+01 -5.566336E+01 + --- H2 1 1.336038E-17 3.281844E-16 -5.598989E+01 -5.278861E+01 -7.069201E+01 -6.108817E+01 + --- O2 0 5.499996E-39 5.499996E-39 -1.141882E+02 -1.141882E+02 1.626471E+02 1.498420E+02 + --- Norms of Delta G(): 7.795325E+01 7.074156E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 1.8693625E+00 @@ -1166,15 +1060,164 @@ VCS CALCULATION METHOD ------------------------------------------------------------------------------------------------------- --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 + --- Increment counter increased, step is accepted: 9 + --- Normal element abundance check - passed + --- Check for an optimum basis passed + --- Equilibrium check for major species: H+ failed + --- Subroutine vcs_dfe called for components and minors + --- Subroutine vcs_deltag called for minor noncomponents + +============================================================================================================== + Iteration = 9, Iterations since last evaluation of optimal basis = 7 (all species) + --- vcs_popPhaseID() called + --- Phase Status F_e MoleNum + -------------------------------------------------------------- + --- NaCl_electrolyte 2 NA 1.869e+00 + --- air 2 NA 4.131e+00 + --- NaCl(S) 2 NA 5.000e+00 + -------------------------------------------------------------- + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H+ 4.0507E-15 5.5223E-14 -2.7266E+01 | Normal calc: diag adjusted from 4.93745e+14 to 4.93745e+14 due to act coeff + --- H2O 1.3064E-01 0.0000E+00 -3.0269E-12 | Skipped: superconverged DG = -3.027E-12 + --- NaCl 4.0240E-32 8.2685E-35 -2.0548E-03 | Normal Calc + --- Cl- 1.7291E-13 4.8123E-12 -5.5663E+01 | Normal calc: diag adjusted from 1.1567e+13 to 1.1567e+13 due to act coeff + --- H2 3.2818E-16 6.6827E-15 -6.1088E+01 | Normal Calc + --- O2 5.5000E-39 0.0000E+00 1.4984E+02 | Skipped: IC = 0 and DG >0: 1.498E+02 + ---------------------------------------------------------------------------------- + --- Main Loop Treatment of each non-component species - Full Calculation: + --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment + --- H+ 1 4.0507E-15 5.9273E-14 5.5223E-14 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged + --- NaCl 0 4.0240E-32 4.0323E-32 8.2770E-35 | minor species alternative calc + --- Cl- 1 1.7291E-13 4.9852E-12 4.8123E-12 | Normal Major Calc + --- H2 1 3.2818E-16 7.0109E-15 6.6827E-15 | Normal Major Calc + --- O2 0 5.5000E-39 5.5000E-49-5.5000E-39 | minor species alternative calc + --- NaCl(S) c 5.0000E+00 5.0000E+00-4.8123E-12 | + --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | + --- H2O(L) c 1.8694E+00 1.8694E+00-6.8588E-14 | + --- Na+ c 1.7291E-13 4.9852E-12 4.8123E-12 | + --- OH- c 4.0507E-15 5.9273E-14 5.5223E-14 | + --- OH c 6.5637E-16 1.4022E-14 1.3365E-14 | + --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | + -------------------------------------------------------------------------------- + --- Finished Main Loop + --- Subroutine vcs_dfe called for all species using tentative solution + --- Subroutine vcs_deltag called for all noncomponents + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932459E+03 + --- subroutine FORCE: Beginning Slope = -2.69781e-10 + --- subroutine FORCE: End Slope = -2.37071e-10 + --- subroutine FORCE produced no adjustments, s2 < 0 + ------------------------------------------------------------------------------------------------------- + --- Summary of the Update (all species): + --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT + --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 + --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 + --- Na+ 1.729062E-13 4.985182E-12 -1.299710E+02 -1.266095E+02 + --- OH- 4.050672E-15 5.927327E-14 -1.212324E+02 -1.185492E+02 + --- OH 6.563687E-16 1.402182E-14 -1.278653E+02 -1.248036E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 + --- H+ 1 4.050672E-15 5.927327E-14 -2.974896E+01 -2.706569E+01 -2.726589E+01 -2.189936E+01 + --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.026912E-12 2.188472E-12 + --- NaCl 0 4.024024E-32 4.032301E-32 -1.745188E+02 -1.745168E+02 -2.054772E-03 -2.842171E-14 + --- Cl- 1 1.729062E-13 4.985182E-12 -1.002091E+02 -9.684768E+01 -5.566336E+01 -4.894043E+01 + --- H2 1 3.281844E-16 7.010911E-15 -5.278861E+01 -4.972696E+01 -6.108817E+01 -5.190322E+01 + --- O2 0 5.499996E-39 5.499996E-49 -1.141882E+02 -1.372140E+02 1.498420E+02 1.145695E+02 + --- Norms of Delta G(): 7.074156E+01 5.581945E+01 + --- Phase_Name KMoles(after update) + --- -------------------------------------------------- + --- NaCl_electrolyte = 1.8693625E+00 + --- air = 4.1306375E+00 + --- NaCl(S) = 5.0000000E+00 + ------------------------------------------------------------------------------------------------------- + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123243932459E+03 + --- Increment counter increased, step is accepted: 10 + --- Normal element abundance check - passed + --- Check for an optimum basis passed + --- Reevaluate major-minor status of noncomponents: + --- Equilibrium check for major species: H+ failed + +============================================================================================================== + Iteration = 10, Iterations since last evaluation of optimal basis = 8 (only major species) + --- vcs_popPhaseID() called + --- Phase Status F_e MoleNum + -------------------------------------------------------------- + --- NaCl_electrolyte 2 NA 1.869e+00 + --- air 2 NA 4.131e+00 + --- NaCl(S) 2 NA 5.000e+00 + -------------------------------------------------------------- + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H+ 5.9273E-14 6.4902E-13 -2.1899E+01 | Normal calc: diag adjusted from 3.3742e+13 to 3.3742e+13 due to act coeff + --- H2O 1.3064E-01 0.0000E+00 2.1885E-12 | Skipped: superconverged DG = 2.188E-12 + --- NaCl 4.0323E-32 0.0000E+00 -2.8422E-14 | Skipped: superconverged DG = -2.842E-14 + --- Cl- 4.9852E-12 1.2199E-10 -4.8940E+01 | Normal calc: diag adjusted from 4.01189e+11 to 4.01186e+11 due to act coeff + --- H2 7.0109E-15 1.2130E-13 -5.1903E+01 | Normal Calc + --- O2 5.5000E-49 0.0000E+00 1.1457E+02 | Skipped: IC = 0 and DG >0: 1.146E+02 + ---------------------------------------------------------------------------------- + --- Main Loop Treatment of each non-component species - Major Components Calculation: + --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment + --- H+ 1 5.9273E-14 7.0830E-13 6.4902E-13 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged + --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered + --- Cl- 1 4.9852E-12 1.2697E-10 1.2199E-10 | Normal Major Calc + --- H2 1 7.0109E-15 1.2831E-13 1.2130E-13 | Normal Major Calc + --- O2 0 5.5000E-49 5.5000E-49 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-1.2199E-10 | + --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | + --- H2O(L) c 1.8694E+00 1.8694E+00-8.9162E-13 | + --- Na+ c 4.9852E-12 1.2697E-10 1.2199E-10 | + --- OH- c 5.9273E-14 7.0830E-13 6.4902E-13 | + --- OH c 1.4022E-14 2.5661E-13 2.4259E-13 | + --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | + -------------------------------------------------------------------------------- + --- Finished Main Loop + --- Subroutine vcs_dfe called for all species using tentative solution + --- Subroutine vcs_deltag called for all noncomponents + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932459E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932513E+03 + --- subroutine FORCE: Beginning Slope = -5.99072e-09 + --- subroutine FORCE: End Slope = -5.19657e-09 + --- subroutine FORCE produced no adjustments, s2 < 0 + ------------------------------------------------------------------------------------------------------- + --- Summary of the Update (only major species): + --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT + --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 + --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 + --- Na+ 4.985182E-12 1.269745E-10 -1.266095E+02 -1.233721E+02 + --- OH- 5.927327E-14 7.082968E-13 -1.185492E+02 -1.160685E+02 + --- OH 1.402182E-14 2.566144E-13 -1.248036E+02 -1.218967E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 + --- H+ 1 5.927327E-14 7.082968E-13 -2.706569E+01 -2.458505E+01 -2.189936E+01 -1.693807E+01 + --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 2.188472E-12 1.332978E-10 + --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 -2.842171E-14 -1.136868E-13 + --- Cl- 1 4.985182E-12 1.269745E-10 -9.684768E+01 -9.361022E+01 -4.894043E+01 -4.246551E+01 + --- H2 1 7.010911E-15 1.283072E-13 -4.972696E+01 -4.682000E+01 -5.190322E+01 -4.318234E+01 + --- O2 0 5.499996E-49 5.499996E-49 -1.372140E+02 -1.372140E+02 1.145695E+02 1.029417E+02 + --- Norms of Delta G(): 5.581945E+01 4.924754E+01 + --- Phase_Name KMoles(after update) + --- -------------------------------------------------- + --- NaCl_electrolyte = 1.8693625E+00 + --- air = 4.1306375E+00 + --- NaCl(S) = 5.0000000E+00 + ------------------------------------------------------------------------------------------------------- + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932459E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123243932513E+03 --- Increment counter increased, step is accepted: 11 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed - --- Subroutine vcs_dfe called for components and minors - --- Subroutine vcs_deltag called for minor noncomponents ============================================================================================================== - Iteration = 11, Iterations since last evaluation of optimal basis = 3 (all species) + Iteration = 11, Iterations since last evaluation of optimal basis = 9 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -1186,70 +1229,69 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.0672E-34 6.2662E-33 -1.1743E+02 | Normal Calc - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0320E-32 2.8272E-36 -7.0120E-05 | Normal Calc - --- Cl- 7.1205E-34 5.3240E-32 -1.4954E+02 | Normal Calc - --- H2 8.7838E-36 5.7473E-34 -1.9629E+02 | Normal Calc - --- O2 4.9406E-43 0.0000E+00 3.2079E+02 | Skipped: IC = 0 and DG >0: 3.208E+02 + --- H+ 7.0830E-13 5.9986E-12 -1.6938E+01 | Normal calc: diag adjusted from 2.82368e+12 to 2.82367e+12 due to act coeff + --- H2O 1.3064E-01 -1.7982E-11 1.3330E-10 | Normal Calc + --- NaCl 4.0323E-32 0.0000E+00 -1.1369E-13 | Skipped: superconverged DG = -1.137E-13 + --- Cl- 1.2697E-10 2.6961E-09 -4.2466E+01 | Normal calc: diag adjusted from 1.57512e+10 to 1.57506e+10 due to act coeff + --- H2 1.2831E-13 1.8469E-12 -4.3182E+01 | Normal Calc + --- O2 5.5000E-49 0.0000E+00 1.0294E+02 | Skipped: IC = 0 and DG >0: 1.029E+02 ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Full Calculation: + --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.0672E-34 6.3729E-33 6.2662E-33 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0320E-32 4.0323E-32 2.8273E-36 | minor species alternative calc - --- Cl- 1 7.1205E-34 5.3952E-32 5.3240E-32 | Normal Major Calc - --- H2 1 8.7838E-36 5.8351E-34 5.7473E-34 | Normal Major Calc - --- O2 0 4.9406E-43 4.9406E-53-4.9406E-43 | minor species alternative calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-5.3243E-32 | + --- H+ 1 7.0830E-13 6.7069E-12 5.9986E-12 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3064E-01-1.7982E-11 | Normal Major Calc + --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered + --- Cl- 1 1.2697E-10 2.8231E-09 2.6961E-09 | Normal Major Calc + --- H2 1 1.2831E-13 1.9752E-12 1.8469E-12 | Normal Major Calc + --- O2 0 5.5000E-49 5.5000E-49 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-2.6961E-09 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-7.4156E-33 | - --- Na+ c 7.1205E-34 5.3952E-32 5.3240E-32 | - --- OH- c 1.0672E-34 6.3729E-33 6.2662E-33 | - --- OH c 1.7568E-35 1.1670E-33 1.1495E-33 | + --- H2O(L) c 1.8694E+00 1.8694E+00 8.2901E-12 | + --- Na+ c 1.2697E-10 2.8231E-09 2.6961E-09 | + --- OH- c 7.0830E-13 6.7069E-12 5.9986E-12 | + --- OH c 2.5661E-13 3.9504E-12 3.6937E-12 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -8.81028e-30 - --- subroutine FORCE: End Slope = -8.29098e-30 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932513E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243933538E+03 + --- subroutine FORCE: Beginning Slope = -1.14673e-07 + --- subroutine FORCE: End Slope = -9.79081e-08 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (all species): + --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 7.120495E-34 5.395240E-32 -1.769099E+02 -1.725822E+02 - --- OH- 1.067202E-34 6.372895E-33 -1.663154E+02 -1.622258E+02 - --- OH 1.756769E-35 1.167020E-33 -1.729325E+02 -1.687363E+02 + --- Na+ 1.269745E-10 2.823091E-09 -1.233721E+02 -1.202707E+02 + --- OH- 7.082968E-13 6.706888E-12 -1.160685E+02 -1.138208E+02 + --- OH 2.566144E-13 3.950352E-12 -1.218967E+02 -1.191627E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.067202E-34 6.372895E-33 -7.483192E+01 -7.074232E+01 -1.174318E+02 -1.092526E+02 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032019E-32 4.032301E-32 -1.745169E+02 -1.745168E+02 -7.011994E-05 0.000000E+00 - --- Cl- 1 7.120495E-34 5.395240E-32 -1.471480E+02 -1.428203E+02 -1.495411E+02 -1.408857E+02 - --- H2 1 8.783847E-36 5.835101E-34 -9.785580E+01 -9.365966E+01 -1.962897E+02 -1.837013E+02 - --- O2 0 4.940635E-43 4.940632E-53 -1.235058E+02 -1.465316E+02 3.207931E+02 2.809827E+02 - --- Norms of Delta G(): 1.720420E+02 1.551786E+02 + --- H+ 1 7.082968E-13 6.706888E-12 -2.458505E+01 -2.233729E+01 -1.693807E+01 -1.244255E+01 + --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 1.332978E-10 2.889266E-09 + --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 -1.136868E-13 2.899014E-12 + --- Cl- 1 1.269745E-10 2.823091E-09 -9.361022E+01 -9.050889E+01 -4.246551E+01 -3.626285E+01 + --- H2 1 1.283072E-13 1.975176E-12 -4.682000E+01 -4.408602E+01 -4.318234E+01 -3.498039E+01 + --- O2 0 5.499996E-49 5.499996E-49 -1.372140E+02 -1.372140E+02 1.029417E+02 9.200573E+01 + --- Norms of Delta G(): 4.924754E+01 4.312481E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 1.8693625E+00 --- air = 4.1306375E+00 --- NaCl(S) = 5.0000000E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932513E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123243933538E+03 --- Increment counter increased, step is accepted: 12 --- Normal element abundance check - passed --- Check for an optimum basis passed - --- Reevaluate major-minor status of noncomponents: --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 12, Iterations since last evaluation of optimal basis = 4 (only major species) + Iteration = 12, Iterations since last evaluation of optimal basis = 10 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -1261,36 +1303,36 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 6.3729E-33 3.4813E-31 -1.0925E+02 | Normal Calc - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 5.3952E-32 3.8006E-30 -1.4089E+02 | Normal Calc - --- H2 5.8351E-34 3.5731E-32 -1.8370E+02 | Normal Calc - --- O2 4.9406E-53 0.0000E+00 2.8098E+02 | Skipped: IC = 0 and DG >0: 2.810E+02 + --- H+ 6.7069E-12 4.1725E-11 -1.2443E+01 | Normal calc: diag adjusted from 2.98201e+11 to 2.98201e+11 due to act coeff + --- H2O 1.3064E-01 -3.8977E-10 2.8893E-09 | Normal calc: diag adjusted from 7.41267 to 7.41267 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 2.8990E-12 | Skipped: superconverged DG = 2.899E-12 + --- Cl- 2.8231E-09 5.1195E-08 -3.6263E+01 | Normal calc: diag adjusted from 7.08443e+08 to 7.08323e+08 due to act coeff + --- H2 1.9752E-12 2.3031E-11 -3.4980E+01 | Normal Calc + --- O2 5.5000E-49 0.0000E+00 9.2006E+01 | Skipped: IC = 0 and DG >0: 9.201E+01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 6.3729E-33 3.5450E-31 3.4813E-31 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged + --- H+ 1 6.7069E-12 4.8432E-11 4.1725E-11 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3064E-01-3.8977E-10 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 5.3952E-32 3.8545E-30 3.8006E-30 | Normal Major Calc - --- H2 1 5.8351E-34 3.6314E-32 3.5731E-32 | Normal Major Calc - --- O2 0 4.9406E-53 4.9406E-53 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-3.8006E-30 | + --- Cl- 1 2.8231E-09 5.4018E-08 5.1195E-08 | Normal Major Calc + --- H2 1 1.9752E-12 2.5006E-11 2.3031E-11 | Normal Major Calc + --- O2 0 5.5000E-49 5.5000E-49 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-5.1195E-08 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-4.1959E-31 | - --- Na+ c 5.3952E-32 3.8545E-30 3.8006E-30 | - --- OH- c 6.3729E-33 3.5450E-31 3.4813E-31 | - --- OH c 1.1670E-33 7.2628E-32 7.1461E-32 | + --- H2O(L) c 1.8694E+00 1.8694E+00 3.0199E-10 | + --- Na+ c 2.8231E-09 5.4018E-08 5.1195E-08 | + --- OH- c 6.7069E-12 4.8432E-11 4.1725E-11 | + --- OH c 3.9504E-12 5.0012E-11 4.6062E-11 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -5.80042e-28 - --- subroutine FORCE: End Slope = -5.44353e-28 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243933538E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243949950E+03 + --- subroutine FORCE: Beginning Slope = -1.85781e-06 + --- subroutine FORCE: End Slope = -1.55538e-06 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): @@ -1298,1071 +1340,26 @@ VCS CALCULATION METHOD --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 5.395240E-32 3.854513E-30 -1.725822E+02 -1.683133E+02 - --- OH- 6.372895E-33 3.545006E-31 -1.622258E+02 -1.582071E+02 - --- OH 1.167020E-33 7.262807E-32 -1.687363E+02 -1.646054E+02 + --- Na+ 2.823091E-09 5.401842E-08 -1.202707E+02 -1.173204E+02 + --- OH- 6.706888E-12 4.843231E-11 -1.138208E+02 -1.118449E+02 + --- OH 3.950352E-12 5.001197E-11 -1.191627E+02 -1.166242E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 6.372895E-33 3.545006E-31 -7.074232E+01 -6.672366E+01 -1.092526E+02 -1.012153E+02 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 5.395240E-32 3.854513E-30 -1.428203E+02 -1.385514E+02 -1.408857E+02 -1.323479E+02 - --- H2 1 5.835101E-34 3.631403E-32 -9.365966E+01 -8.952876E+01 -1.837013E+02 -1.713086E+02 - --- O2 0 4.940632E-53 4.940632E-53 -1.465316E+02 -1.465316E+02 2.809827E+02 2.644591E+02 - --- Norms of Delta G(): 1.551786E+02 1.455139E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 13 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 13, Iterations since last evaluation of optimal basis = 5 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 3.5450E-31 1.7940E-29 -1.0122E+02 | Normal Calc - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 3.8545E-30 2.5507E-28 -1.3235E+02 | Normal Calc - --- H2 3.6314E-32 2.0736E-30 -1.7131E+02 | Normal Calc - --- O2 4.9406E-53 0.0000E+00 2.6446E+02 | Skipped: IC = 0 and DG >0: 2.645E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 3.5450E-31 1.8295E-29 1.7940E-29 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 3.8545E-30 2.5892E-28 2.5507E-28 | Normal Major Calc - --- H2 1 3.6314E-32 2.1099E-30 2.0736E-30 | Normal Major Calc - --- O2 0 4.9406E-53 4.9406E-53 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-2.5507E-28 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-2.2088E-29 | - --- Na+ c 3.8545E-30 2.5892E-28 2.5507E-28 | - --- OH- c 3.5450E-31 1.8295E-29 1.7940E-29 | - --- OH c 7.2628E-32 4.2199E-30 4.1473E-30 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -3.59288e-26 - --- subroutine FORCE: End Slope = -3.36158e-26 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 3.854513E-30 2.589229E-28 -1.683133E+02 -1.641060E+02 - --- OH- 3.545006E-31 1.829494E-29 -1.582071E+02 -1.542635E+02 - --- OH 7.262807E-32 4.219899E-30 -1.646054E+02 -1.605432E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 3.545006E-31 1.829494E-29 -6.672366E+01 -6.277999E+01 -1.012153E+02 -9.332796E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 3.854513E-30 2.589229E-28 -1.385514E+02 -1.343441E+02 -1.323479E+02 -1.239333E+02 - --- H2 1 3.631403E-32 2.109950E-30 -8.952876E+01 -8.546654E+01 -1.713086E+02 -1.591220E+02 - --- O2 0 4.940632E-53 4.940632E-53 -1.465316E+02 -1.465316E+02 2.644591E+02 2.482102E+02 - --- Norms of Delta G(): 1.455139E+02 1.360133E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 14 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 14, Iterations since last evaluation of optimal basis = 6 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8295E-29 8.5371E-28 -9.3328E+01 | Normal Calc - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 2.5892E-28 1.6045E-26 -1.2393E+02 | Normal Calc - --- H2 2.1099E-30 1.1191E-28 -1.5912E+02 | Normal Calc - --- O2 4.9406E-53 0.0000E+00 2.4821E+02 | Skipped: IC = 0 and DG >0: 2.482E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8295E-29 8.7201E-28 8.5371E-28 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.5892E-28 1.6304E-26 1.6045E-26 | Normal Major Calc - --- H2 1 2.1099E-30 1.1402E-28 1.1191E-28 | Normal Major Calc - --- O2 0 4.9406E-53 4.9406E-53 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.6045E-26 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-1.0775E-27 | - --- Na+ c 2.5892E-28 1.6304E-26 1.6045E-26 | - --- OH- c 1.8295E-29 8.7201E-28 8.5371E-28 | - --- OH c 4.2199E-30 2.2805E-28 2.2383E-28 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -2.08594e-24 - --- subroutine FORCE: End Slope = -1.94507e-24 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 2.589229E-28 1.630351E-26 -1.641060E+02 -1.599634E+02 - --- OH- 1.829494E-29 8.720097E-28 -1.542635E+02 -1.503993E+02 - --- OH 4.219899E-30 2.280461E-28 -1.605432E+02 -1.565535E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.829494E-29 8.720097E-28 -6.277999E+01 -5.891581E+01 -9.332796E+01 -8.559960E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 2.589229E-28 1.630351E-26 -1.343441E+02 -1.302015E+02 -1.239333E+02 -1.156481E+02 - --- H2 1 2.109950E-30 1.140231E-28 -8.546654E+01 -8.147681E+01 -1.591220E+02 -1.471528E+02 - --- O2 0 4.940632E-53 4.940632E-53 -1.465316E+02 -1.465316E+02 2.482102E+02 2.322513E+02 - --- Norms of Delta G(): 1.360133E+02 1.266862E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 15 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - --- Subroutine vcs_dfe called for components and minors - --- Subroutine vcs_deltag called for minor noncomponents - -============================================================================================================== - Iteration = 15, Iterations since last evaluation of optimal basis = 7 (all species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 8.7201E-28 3.7322E-26 -8.5600E+01 | Normal Calc - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 1.6304E-26 9.4274E-25 -1.1565E+02 | Normal calc: diag adjusted from 1.22673e+26 to 1.22673e+26 due to act coeff - --- H2 1.1402E-28 5.5929E-27 -1.4715E+02 | Normal Calc - --- O2 4.9406E-53 0.0000E+00 2.3225E+02 | Skipped: IC = 0 and DG >0: 2.323E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Full Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 8.7201E-28 3.8194E-26 3.7322E-26 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species alternative calc - --- Cl- 1 1.6304E-26 9.5904E-25 9.4274E-25 | Normal Major Calc - --- H2 1 1.1402E-28 5.7070E-27 5.5929E-27 | Normal Major Calc - --- O2 0 4.9406E-53 4.9406E-63-4.9406E-53 | minor species alternative calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-9.4274E-25 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-4.8508E-26 | - --- Na+ c 1.6304E-26 9.5904E-25 9.4274E-25 | - --- OH- c 8.7201E-28 3.8194E-26 3.7322E-26 | - --- OH c 2.2805E-28 1.1414E-26 1.1186E-26 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -1.13043e-22 - --- subroutine FORCE: End Slope = -1.05013e-22 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (all species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 1.630351E-26 9.590389E-25 -1.599634E+02 -1.558888E+02 - --- OH- 8.720097E-28 3.819385E-26 -1.503993E+02 -1.466197E+02 - --- OH 2.280461E-28 1.141392E-26 -1.565535E+02 -1.526404E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 8.720097E-28 3.819385E-26 -5.891581E+01 -5.513619E+01 -8.559960E+01 -7.804035E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 1.630351E-26 9.590389E-25 -1.302015E+02 -1.261270E+02 -1.156481E+02 -1.074990E+02 - --- H2 1 1.140231E-28 5.706959E-27 -8.147681E+01 -7.756377E+01 -1.471528E+02 -1.354136E+02 - --- O2 0 4.940632E-53 4.940635E-63 -1.465316E+02 -1.695575E+02 2.322513E+02 1.935733E+02 - --- Norms of Delta G(): 1.266862E+02 1.106449E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 16 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Reevaluate major-minor status of noncomponents: - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 16, Iterations since last evaluation of optimal basis = 8 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 3.8194E-26 1.4903E-24 -7.8040E+01 | Normal calc: diag adjusted from 5.23644e+25 to 5.23644e+25 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 9.5904E-25 5.1548E-23 -1.0750E+02 | Normal calc: diag adjusted from 2.08542e+24 to 2.08542e+24 due to act coeff - --- H2 5.7070E-27 2.5760E-25 -1.3541E+02 | Normal Calc - --- O2 4.9406E-63 0.0000E+00 1.9357E+02 | Skipped: IC = 0 and DG >0: 1.936E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 3.8194E-26 1.5285E-24 1.4903E-24 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 9.5904E-25 5.2507E-23 5.1548E-23 | Normal Major Calc - --- H2 1 5.7070E-27 2.6331E-25 2.5760E-25 | Normal Major Calc - --- O2 0 4.9406E-63 4.9406E-63 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-5.1548E-23 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-2.0055E-24 | - --- Na+ c 9.5904E-25 5.2507E-23 5.1548E-23 | - --- OH- c 3.8194E-26 1.5285E-24 1.4903E-24 | - --- OH c 1.1414E-26 5.2661E-25 5.1520E-25 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -5.69254e-21 - --- subroutine FORCE: End Slope = -5.26591e-21 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 9.590389E-25 5.250692E-23 -1.558888E+02 -1.518861E+02 - --- OH- 3.819385E-26 1.528525E-24 -1.466197E+02 -1.429303E+02 - --- OH 1.141392E-26 5.266139E-25 -1.526404E+02 -1.488088E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 3.819385E-26 1.528525E-24 -5.513619E+01 -5.144680E+01 -7.804035E+01 -7.066158E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 9.590389E-25 5.250692E-23 -1.261270E+02 -1.221242E+02 -1.074990E+02 -9.949349E+01 - --- H2 1 5.706959E-27 2.633070E-25 -7.756377E+01 -7.373213E+01 -1.354136E+02 -1.239187E+02 - --- O2 0 4.940635E-63 4.940635E-63 -1.695575E+02 -1.695575E+02 1.935733E+02 1.782467E+02 - --- Norms of Delta G(): 1.106449E+02 1.016692E+02 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 17 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 17, Iterations since last evaluation of optimal basis = 9 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.5285E-24 5.4004E-23 -7.0662E+01 | Normal calc: diag adjusted from 1.30845e+24 to 1.30845e+24 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 5.2507E-23 2.6120E-21 -9.9493E+01 | Normal calc: diag adjusted from 3.80902e+22 to 3.80902e+22 due to act coeff - --- H2 2.6331E-25 1.0876E-23 -1.2392E+02 | Normal Calc - --- O2 4.9406E-63 0.0000E+00 1.7825E+02 | Skipped: IC = 0 and DG >0: 1.782E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.5285E-24 5.5533E-23 5.4004E-23 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 5.2507E-23 2.6646E-21 2.6120E-21 | Normal Major Calc - --- H2 1 2.6331E-25 1.1140E-23 1.0876E-23 | Normal Major Calc - --- O2 0 4.9406E-63 4.9406E-63 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-2.6120E-21 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-7.5756E-23 | - --- Na+ c 5.2507E-23 2.6646E-21 2.6120E-21 | - --- OH- c 1.5285E-24 5.5533E-23 5.4004E-23 | - --- OH c 5.2661E-25 2.2279E-23 2.1752E-23 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -2.65046e-19 - --- subroutine FORCE: End Slope = -2.44021e-19 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 5.250692E-23 2.664555E-21 -1.518861E+02 -1.479592E+02 - --- OH- 1.528525E-24 5.553250E-23 -1.429303E+02 -1.393376E+02 - --- OH 5.266139E-25 2.227906E-23 -1.488088E+02 -1.450639E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.528525E-24 5.553250E-23 -5.144680E+01 -4.785414E+01 -7.066158E+01 -6.347625E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 5.250692E-23 2.664555E-21 -1.221242E+02 -1.181974E+02 -9.949349E+01 -9.163980E+01 - --- H2 1 2.633070E-25 1.113953E-23 -7.373213E+01 -6.998720E+01 -1.239187E+02 -1.126839E+02 - --- O2 0 4.940635E-63 4.940635E-63 -1.695575E+02 -1.695575E+02 1.782467E+02 1.632670E+02 - --- Norms of Delta G(): 1.016692E+02 9.289857E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 18 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 18, Iterations since last evaluation of optimal basis = 10 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 5.5533E-23 1.7625E-21 -6.3476E+01 | Normal calc: diag adjusted from 3.60149e+22 to 3.60149e+22 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 2.6646E-21 1.2209E-19 -9.1640E+01 | Normal calc: diag adjusted from 7.50594e+20 to 7.50594e+20 due to act coeff - --- H2 1.1140E-23 4.1842E-22 -1.1268E+02 | Normal Calc - --- O2 4.9406E-63 0.0000E+00 1.6327E+02 | Skipped: IC = 0 and DG >0: 1.633E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 5.5533E-23 1.8180E-21 1.7625E-21 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.6646E-21 1.2475E-19 1.2209E-19 | Normal Major Calc - --- H2 1 1.1140E-23 4.2955E-22 4.1842E-22 | Normal Major Calc - --- O2 0 4.9406E-63 4.9406E-63 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.2209E-19 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-2.5993E-21 | - --- Na+ c 2.6646E-21 1.2475E-19 1.2209E-19 | - --- OH- c 5.5533E-23 1.8180E-21 1.7625E-21 | - --- OH c 2.2279E-23 8.5911E-22 8.3683E-22 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -1.13473e-17 - --- subroutine FORCE: End Slope = -1.03912e-17 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 2.664555E-21 1.247542E-19 -1.479592E+02 -1.441129E+02 - --- OH- 5.553250E-23 1.818030E-21 -1.393376E+02 -1.358491E+02 - --- OH 2.227906E-23 8.591096E-22 -1.450639E+02 -1.414116E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 5.553250E-23 1.818030E-21 -4.785414E+01 -4.436560E+01 -6.347625E+01 -5.649917E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 2.664555E-21 1.247542E-19 -1.181974E+02 -1.143511E+02 -9.163980E+01 -8.394718E+01 - --- H2 1 1.113953E-23 4.295548E-22 -6.998720E+01 -6.633495E+01 -1.126839E+02 -1.017272E+02 - --- O2 0 4.940635E-63 4.940635E-63 -1.695575E+02 -1.695575E+02 1.632670E+02 1.486580E+02 - --- Norms of Delta G(): 9.289857E+01 8.434740E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 19 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - --- Subroutine vcs_dfe called for components and minors - --- Subroutine vcs_deltag called for minor noncomponents - -============================================================================================================== - Iteration = 19, Iterations since last evaluation of optimal basis = 11 (all species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8180E-21 5.1359E-20 -5.6499E+01 | Normal calc: diag adjusted from 1.10009e+21 to 1.10009e+21 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 1.2475E-19 5.2364E-18 -8.3947E+01 | Normal calc: diag adjusted from 1.60315e+19 to 1.60315e+19 due to act coeff - --- H2 4.2955E-22 1.4566E-20 -1.0173E+02 | Normal Calc - --- O2 4.9406E-63 0.0000E+00 1.4866E+02 | Skipped: IC = 0 and DG >0: 1.487E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Full Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8180E-21 5.3177E-20 5.1359E-20 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species alternative calc - --- Cl- 1 1.2475E-19 5.3611E-18 5.2364E-18 | Normal Major Calc - --- H2 1 4.2955E-22 1.4995E-20 1.4566E-20 | Normal Major Calc - --- O2 0 4.9406E-63 4.9406E-73-4.9406E-63 | minor species alternative calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-5.2364E-18 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-8.0490E-20 | - --- Na+ c 1.2475E-19 5.3611E-18 5.2364E-18 | - --- OH- c 1.8180E-21 5.3177E-20 5.1359E-20 | - --- OH c 8.5911E-22 2.9991E-20 2.9132E-20 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -4.43963e-16 - --- subroutine FORCE: End Slope = -4.04077e-16 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (all species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 1.247542E-19 5.361136E-18 -1.441129E+02 -1.403523E+02 - --- OH- 1.818030E-21 5.317662E-20 -1.358491E+02 -1.324732E+02 - --- OH 8.591096E-22 2.999071E-20 -1.414116E+02 -1.378589E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.818030E-21 5.317662E-20 -4.436560E+01 -4.098973E+01 -5.649917E+01 -4.974744E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 1.247542E-19 5.361136E-18 -1.143511E+02 -1.105905E+02 -8.394718E+01 -7.642601E+01 - --- H2 1 4.295548E-22 1.499535E-20 -6.633495E+01 -6.278220E+01 -1.017272E+02 -9.106894E+01 - --- O2 0 4.940635E-63 4.940633E-73 -1.695575E+02 -1.925833E+02 1.486580E+02 1.114212E+02 - --- Norms of Delta G(): 8.434740E+01 6.955091E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 20 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Reevaluate major-minor status of noncomponents: - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 20, Iterations since last evaluation of optimal basis = 12 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 5.3177E-20 1.3227E-18 -4.9747E+01 | Normal calc: diag adjusted from 3.76105e+19 to 3.76105e+19 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 5.3611E-18 2.0487E-16 -7.6426E+01 | Normal calc: diag adjusted from 3.73055e+17 to 3.73055e+17 due to act coeff - --- H2 1.4995E-20 4.5520E-19 -9.1069E+01 | Normal Calc - --- O2 4.9406E-73 0.0000E+00 1.1142E+02 | Skipped: IC = 0 and DG >0: 1.114E+02 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 5.3177E-20 1.3759E-18 1.3227E-18 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 5.3611E-18 2.1023E-16 2.0487E-16 | Normal Major Calc - --- H2 1 1.4995E-20 4.7020E-19 4.5520E-19 | Normal Major Calc - --- O2 0 4.9406E-73 4.9406E-73 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-2.0487E-16 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-2.2331E-18 | - --- Na+ c 5.3611E-18 2.1023E-16 2.0487E-16 | - --- OH- c 5.3177E-20 1.3759E-18 1.3227E-18 | - --- OH c 2.9991E-20 9.4040E-19 9.1041E-19 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -1.57643e-14 - --- subroutine FORCE: End Slope = -1.42477e-14 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 5.361136E-18 2.102263E-16 -1.403523E+02 -1.366833E+02 - --- OH- 5.317662E-20 1.375877E-18 -1.324732E+02 -1.292200E+02 - --- OH 2.999071E-20 9.403980E-19 -1.378589E+02 -1.344135E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 5.317662E-20 1.375877E-18 -4.098973E+01 -3.773650E+01 -4.974744E+01 -4.324098E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.211653E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 5.361136E-18 2.102263E-16 -1.105905E+02 -1.069215E+02 -7.642601E+01 -6.908799E+01 - --- H2 1 1.499535E-20 4.701990E-19 -6.278220E+01 -5.933679E+01 -9.106894E+01 -8.073269E+01 - --- O2 0 4.940633E-73 4.940633E-73 -1.925833E+02 -1.925833E+02 1.114212E+02 9.763951E+01 - --- Norms of Delta G(): 6.955091E+01 6.150091E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 21 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 21, Iterations since last evaluation of optimal basis = 13 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.3759E-18 2.9747E-17 -4.3241E+01 | Normal calc: diag adjusted from 1.45362e+18 to 1.45362e+18 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -3.2117E-12 | Skipped: superconverged DG = -3.212E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 2.1023E-16 7.2621E-15 -6.9088E+01 | Normal calc: diag adjusted from 9.51356e+15 to 9.51356e+15 due to act coeff - --- H2 4.7020E-19 1.2653E-17 -8.0733E+01 | Normal Calc - --- O2 4.9406E-73 0.0000E+00 9.7640E+01 | Skipped: IC = 0 and DG >0: 9.764E+01 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.3759E-18 3.1123E-17 2.9747E-17 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.1023E-16 7.4723E-15 7.2621E-15 | Normal Major Calc - --- H2 1 4.7020E-19 1.3124E-17 1.2653E-17 | Normal Major Calc - --- O2 0 4.9406E-73 4.9406E-73 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-7.2621E-15 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-5.5054E-17 | - --- Na+ c 2.1023E-16 7.4723E-15 7.2621E-15 | - --- OH- c 1.3759E-18 3.1123E-17 2.9747E-17 | - --- OH c 9.4040E-19 2.6247E-17 2.5307E-17 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -5.04029e-13 - --- subroutine FORCE: End Slope = -4.51854e-13 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 2.102263E-16 7.472282E-15 -1.366833E+02 -1.331125E+02 - --- OH- 1.375877E-18 3.112301E-17 -1.292200E+02 -1.261011E+02 - --- OH 9.403980E-19 2.624735E-17 -1.344135E+02 -1.310844E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.375877E-18 3.112301E-17 -3.773650E+01 -3.461765E+01 -4.324098E+01 -3.700327E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.211653E-12 -3.197442E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 2.102263E-16 7.472282E-15 -1.069215E+02 -1.033507E+02 -6.908799E+01 -6.194645E+01 - --- H2 1 4.701990E-19 1.312368E-17 -5.933679E+01 -5.600777E+01 -8.073269E+01 -7.074564E+01 - --- O2 0 4.940633E-73 4.940633E-73 -1.925833E+02 -1.925833E+02 9.763951E+01 8.432344E+01 - --- Norms of Delta G(): 6.150091E+01 5.373080E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 22 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 22, Iterations since last evaluation of optimal basis = 14 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 3.1123E-17 5.7583E-16 -3.7003E+01 | Normal calc: diag adjusted from 6.42611e+16 to 6.42611e+16 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -3.1974E-12 | Skipped: superconverged DG = -3.197E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 7.4723E-15 2.3144E-13 -6.1946E+01 | Normal calc: diag adjusted from 2.67656e+14 to 2.67656e+14 due to act coeff - --- H2 1.3124E-17 3.0948E-16 -7.0746E+01 | Normal Calc - --- O2 4.9406E-73 0.0000E+00 8.4323E+01 | Skipped: IC = 0 and DG >0: 8.432E+01 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 3.1123E-17 6.0695E-16 5.7583E-16 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 7.4723E-15 2.3891E-13 2.3144E-13 | Normal Major Calc - --- H2 1 1.3124E-17 3.2260E-16 3.0948E-16 | Normal Major Calc - --- O2 0 4.9406E-73 4.9406E-73 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-2.3144E-13 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-1.1948E-15 | - --- Na+ c 7.4723E-15 2.3891E-13 2.3144E-13 | - --- OH- c 3.1123E-17 6.0695E-16 5.7583E-16 | - --- OH c 2.6247E-17 6.4521E-16 6.1896E-16 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- subroutine FORCE: Beginning Slope = -1.43801e-11 - --- subroutine FORCE: End Slope = -1.27699e-11 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 7.472282E-15 2.389130E-13 -1.331125E+02 -1.296476E+02 - --- OH- 3.112301E-17 6.069495E-16 -1.261011E+02 -1.231306E+02 - --- OH 2.624735E-17 6.452092E-16 -1.310844E+02 -1.278824E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 3.112301E-17 6.069495E-16 -3.461765E+01 -3.164715E+01 -3.700327E+01 -3.106228E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -3.197442E-12 -2.955858E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 7.472282E-15 2.389130E-13 -1.033507E+02 -9.988579E+01 -6.194645E+01 -5.501666E+01 - --- H2 1 1.312368E-17 3.226046E-16 -5.600777E+01 -5.280576E+01 -7.074564E+01 -6.113961E+01 - --- O2 0 4.940633E-73 4.940633E-73 -1.925833E+02 -1.925833E+02 8.432344E+01 7.151540E+01 - --- Norms of Delta G(): 5.373080E+01 4.626770E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Increment counter increased, step is accepted: 23 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - --- Subroutine vcs_dfe called for components and minors - --- Subroutine vcs_deltag called for minor noncomponents - -============================================================================================================== - Iteration = 23, Iterations since last evaluation of optimal basis = 15 (all species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 6.0695E-16 9.4266E-15 -3.1062E+01 | Normal calc: diag adjusted from 3.29517e+15 to 3.29517e+15 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 -2.9559E-12 | Skipped: superconverged DG = -2.956E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 2.3891E-13 6.5721E-12 -5.5017E+01 | Normal calc: diag adjusted from 8.37125e+12 to 8.37123e+12 due to act coeff - --- H2 3.2260E-16 6.5746E-15 -6.1140E+01 | Normal Calc - --- O2 4.9406E-73 0.0000E+00 7.1515E+01 | Skipped: IC = 0 and DG >0: 7.152E+01 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Full Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 6.0695E-16 1.0034E-14 9.4266E-15 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species alternative calc - --- Cl- 1 2.3891E-13 6.8110E-12 6.5721E-12 | Normal Major Calc - --- H2 1 3.2260E-16 6.8972E-15 6.5746E-15 | Normal Major Calc - --- O2 0 4.9406E-73 4.9406E-83-4.9406E-73 | minor species alternative calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-6.5721E-12 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-2.2576E-14 | - --- Na+ c 2.3891E-13 6.8110E-12 6.5721E-12 | - --- OH- c 6.0695E-16 1.0034E-14 9.4266E-15 | - --- OH c 6.4521E-16 1.3794E-14 1.3149E-14 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932460E+03 - --- subroutine FORCE: Beginning Slope = -3.6227e-10 - --- subroutine FORCE: End Slope = -3.18121e-10 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (all species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 2.389130E-13 6.811021E-12 -1.296476E+02 -1.262975E+02 - --- OH- 6.069495E-16 1.003357E-14 -1.231306E+02 -1.203254E+02 - --- OH 6.452092E-16 1.379449E-14 -1.278824E+02 -1.248200E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 6.069495E-16 1.003357E-14 -3.164715E+01 -2.884192E+01 -3.106228E+01 -2.545181E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 -2.955858E-12 4.092726E-12 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 0.000000E+00 - --- Cl- 1 2.389130E-13 6.811021E-12 -9.988579E+01 -9.653561E+01 -5.501666E+01 -4.831629E+01 - --- H2 1 3.226046E-16 6.897245E-15 -5.280576E+01 -4.974331E+01 -6.113961E+01 -5.195226E+01 - --- O2 0 4.940633E-73 4.940631E-83 -1.925833E+02 -2.156092E+02 7.151540E+01 3.623975E+01 - --- Norms of Delta G(): 4.626770E+01 3.414336E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932456E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932460E+03 - --- Increment counter increased, step is accepted: 24 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Reevaluate major-minor status of noncomponents: - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 24, Iterations since last evaluation of optimal basis = 16 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.0034E-14 1.2769E-13 -2.5452E+01 | Normal calc: diag adjusted from 1.99331e+14 to 1.99331e+14 due to act coeff - --- H2O 1.3064E-01 0.0000E+00 4.0927E-12 | Skipped: superconverged DG = 4.093E-12 - --- NaCl 4.0323E-32 0.0000E+00 0.0000E+00 | Skipped: superconverged DG = 0.000E+00 - --- Cl- 6.8110E-12 1.6454E-10 -4.8316E+01 | Normal calc: diag adjusted from 2.93642e+11 to 2.93639e+11 due to act coeff - --- H2 6.8972E-15 1.1944E-13 -5.1952E+01 | Normal Calc - --- O2 4.9406E-83 0.0000E+00 3.6240E+01 | Skipped: IC = 0 and DG >0: 3.624E+01 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.0034E-14 1.3772E-13 1.2769E-13 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01 0.0000E+00 | major species is converged - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 6.8110E-12 1.7135E-10 1.6454E-10 | Normal Major Calc - --- H2 1 6.8972E-15 1.2634E-13 1.1944E-13 | Normal Major Calc - --- O2 0 4.9406E-83 4.9406E-83 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.6454E-10 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00-3.6657E-13 | - --- Na+ c 6.8110E-12 1.7135E-10 1.6454E-10 | - --- OH- c 1.0034E-14 1.3772E-13 1.2769E-13 | - --- OH c 1.3794E-14 2.5268E-13 2.3888E-13 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932460E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243932531E+03 - --- subroutine FORCE: Beginning Slope = -7.95956e-09 - --- subroutine FORCE: End Slope = -6.89651e-09 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 6.811021E-12 1.713540E-10 -1.262975E+02 -1.230723E+02 - --- OH- 1.003357E-14 1.377198E-13 -1.203254E+02 -1.177062E+02 - --- OH 1.379449E-14 2.526795E-13 -1.248200E+02 -1.219121E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.003357E-14 1.377198E-13 -2.884192E+01 -2.622270E+01 -2.545181E+01 -2.021338E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 4.092726E-12 1.801652E-10 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 0.000000E+00 -8.526513E-14 - --- Cl- 1 6.811021E-12 1.713540E-10 -9.653561E+01 -9.331049E+01 -4.831629E+01 -4.186604E+01 - --- H2 1 6.897245E-15 1.263397E-13 -4.974331E+01 -4.683546E+01 -5.195226E+01 -4.322870E+01 - --- O2 0 4.940631E-83 4.940631E-83 -2.156092E+02 -2.156092E+02 3.623975E+01 2.460834E+01 - --- Norms of Delta G(): 3.414336E+01 2.779580E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932460E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243932531E+03 - --- Increment counter increased, step is accepted: 25 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 25, Iterations since last evaluation of optimal basis = 17 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.3772E-13 1.3919E-12 -2.0213E+01 | Normal calc: diag adjusted from 1.45222e+13 to 1.45222e+13 due to act coeff - --- H2O 1.3064E-01 -2.4305E-11 1.8017E-10 | Normal calc: diag adjusted from 7.41267 to 7.41267 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 -8.5265E-14 | Skipped: superconverged DG = -8.527E-14 - --- Cl- 1.7135E-10 3.5871E-09 -4.1866E+01 | Normal calc: diag adjusted from 1.16717e+10 to 1.16713e+10 due to act coeff - --- H2 1.2634E-13 1.8205E-12 -4.3229E+01 | Normal Calc - --- O2 4.9406E-83 0.0000E+00 2.4608E+01 | Skipped: IC = 0 and DG >0: 2.461E+01 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.3772E-13 1.5296E-12 1.3919E-12 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01-2.4305E-11 | Normal Major Calc - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.7135E-10 3.7585E-09 3.5871E-09 | Normal Major Calc - --- H2 1 1.2634E-13 1.9468E-12 1.8205E-12 | Normal Major Calc - --- O2 0 4.9406E-83 4.9406E-83 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-3.5871E-09 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00 1.9272E-11 | - --- Na+ c 1.7135E-10 3.7585E-09 3.5871E-09 | - --- OH- c 1.3772E-13 1.5296E-12 1.3919E-12 | - --- OH c 2.5268E-13 3.8937E-12 3.6410E-12 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932531E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243933874E+03 - --- subroutine FORCE: Beginning Slope = -1.50285e-07 - --- subroutine FORCE: End Slope = -1.28111e-07 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 1.713540E-10 3.758462E-09 -1.230723E+02 -1.199846E+02 - --- OH- 1.377198E-13 1.529611E-12 -1.177062E+02 -1.152989E+02 - --- OH 2.526795E-13 3.893681E-12 -1.219121E+02 -1.191771E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.377198E-13 1.529611E-12 -2.622270E+01 -2.381546E+01 -2.021338E+01 -1.539890E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 1.801652E-10 3.837442E-09 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 -8.526513E-14 4.490630E-12 - --- Cl- 1 1.713540E-10 3.758462E-09 -9.331049E+01 -9.022276E+01 -4.186604E+01 -3.569059E+01 - --- H2 1 1.263397E-13 1.946841E-12 -4.683546E+01 -4.410047E+01 -4.322870E+01 -3.502374E+01 - --- O2 0 4.940631E-83 4.940631E-83 -2.156092E+02 -2.156092E+02 2.460834E+01 1.366838E+01 - --- Norms of Delta G(): 2.779580E+01 2.207726E+01 - --- Phase_Name KMoles(after update) - --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693625E+00 - --- air = 4.1306375E+00 - --- NaCl(S) = 5.0000000E+00 - ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243932531E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243933874E+03 - --- Increment counter increased, step is accepted: 26 - --- Normal element abundance check - passed - --- Check for an optimum basis passed - --- Equilibrium check for major species: H+ failed - -============================================================================================================== - Iteration = 26, Iterations since last evaluation of optimal basis = 18 (only major species) - --- vcs_popPhaseID() called - --- Phase Status F_e MoleNum - -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.869e+00 - --- air 2 NA 4.131e+00 - --- NaCl(S) 2 NA 5.000e+00 - -------------------------------------------------------------- - ---------------------------------------------------------------------------------- - --- Subroutine vcs_RxnStepSizes called - Details: - ---------------------------------------------------------------------------------- - --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.5296E-12 1.1777E-11 -1.5399E+01 | Normal calc: diag adjusted from 1.30752e+12 to 1.30752e+12 due to act coeff - --- H2O 1.3064E-01 -5.1769E-10 3.8374E-09 | Normal calc: diag adjusted from 7.41267 to 7.41267 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 4.4906E-12 | Skipped: superconverged DG = 4.491E-12 - --- Cl- 3.7585E-09 6.7084E-08 -3.5691E+01 | Normal calc: diag adjusted from 5.32133e+08 to 5.32028e+08 due to act coeff - --- H2 1.9468E-12 2.2729E-11 -3.5024E+01 | Normal Calc - --- O2 4.9406E-83 0.0000E+00 1.3668E+01 | Skipped: IC = 0 and DG >0: 1.367E+01 - ---------------------------------------------------------------------------------- - --- Main Loop Treatment of each non-component species - Major Components Calculation: - --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.5296E-12 1.3307E-11 1.1777E-11 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01-5.1769E-10 | Normal Major Calc - --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 3.7585E-09 7.0842E-08 6.7084E-08 | Normal Major Calc - --- H2 1 1.9468E-12 2.4675E-11 2.2729E-11 | Normal Major Calc - --- O2 0 4.9406E-83 4.9406E-83 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-6.7084E-08 | - --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00 4.6045E-10 | - --- Na+ c 3.7585E-09 7.0842E-08 6.7084E-08 | - --- OH- c 1.5296E-12 1.3307E-11 1.1777E-11 | - --- OH c 3.8937E-12 4.9351E-11 4.5457E-11 | - --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | - -------------------------------------------------------------------------------- - --- Finished Main Loop - --- Subroutine vcs_dfe called for all species using tentative solution - --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243933874E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123243955007E+03 - --- subroutine FORCE: Beginning Slope = -2.39525e-06 - --- subroutine FORCE: End Slope = -2.00122e-06 - --- subroutine FORCE produced no adjustments, s2 < 0 - ------------------------------------------------------------------------------------------------------- - --- Summary of the Update (only major species): - --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 5.000000E+00 5.000000E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 3.758462E-09 7.084247E-08 -1.199846E+02 -1.170495E+02 - --- OH- 1.529611E-12 1.330678E-11 -1.152989E+02 -1.131370E+02 - --- OH 3.893681E-12 4.935077E-11 -1.191771E+02 -1.166375E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.529611E-12 1.330678E-11 -2.381546E+01 -2.165351E+01 -1.539890E+01 -1.107499E+01 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 3.837442E-09 7.172578E-08 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 4.490630E-12 1.132889E-10 - --- Cl- 1 3.758462E-09 7.084247E-08 -9.022276E+01 -8.728762E+01 -3.569059E+01 -2.982031E+01 - --- H2 1 1.946841E-12 2.467539E-11 -4.410047E+01 -4.156087E+01 -3.502374E+01 -2.740494E+01 - --- O2 0 4.940631E-83 4.940631E-83 -2.156092E+02 -2.156092E+02 1.366838E+01 3.509991E+00 - --- Norms of Delta G(): 2.207726E+01 1.720105E+01 + --- H+ 1 6.706888E-12 4.843231E-11 -2.233729E+01 -2.036140E+01 -1.244255E+01 -8.490778E+00 + --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 2.889266E-09 5.477268E-08 + --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 2.899014E-12 8.051870E-11 + --- Cl- 1 2.823091E-09 5.401842E-08 -9.050889E+01 -8.755854E+01 -3.626285E+01 -3.036215E+01 + --- H2 1 1.975176E-12 2.500598E-11 -4.408602E+01 -4.154756E+01 -3.498039E+01 -2.736502E+01 + --- O2 0 5.499996E-49 5.499996E-49 -1.372140E+02 -1.372140E+02 9.200573E+01 8.185190E+01 + --- Norms of Delta G(): 4.312481E+01 3.751118E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 1.8693626E+00 --- air = 4.1306375E+00 --- NaCl(S) = 4.9999999E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243933874E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123243955007E+03 - --- Increment counter increased, step is accepted: 27 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243933538E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123243949950E+03 + --- Increment counter increased, step is accepted: 13 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed @@ -2370,7 +1367,7 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for minor noncomponents ============================================================================================================== - Iteration = 27, Iterations since last evaluation of optimal basis = 19 (all species) + Iteration = 13, Iterations since last evaluation of optimal basis = 11 (all species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -2382,36 +1379,36 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.3307E-11 7.3686E-11 -1.1075E+01 | Normal calc: diag adjusted from 1.50299e+11 to 1.50299e+11 due to act coeff - --- H2O 1.3064E-01 -9.6761E-09 7.1726E-08 | Normal calc: diag adjusted from 7.41267 to 7.41267 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 1.1329E-10 | Skipped: IC = 0 and DG >0: 1.133E-10 - --- Cl- 7.0842E-08 1.0572E-06 -2.9820E+01 | Normal calc: diag adjusted from 2.82317e+07 to 2.82077e+07 due to act coeff - --- H2 2.4675E-11 2.2541E-10 -2.7405E+01 | Normal Calc - --- O2 4.9406E-83 0.0000E+00 3.5100E+00 | Skipped: IC = 0 and DG >0: 3.510E+00 + --- H+ 4.8432E-11 2.0561E-10 -8.4908E+00 | Normal calc: diag adjusted from 4.12947e+10 to 4.12947e+10 due to act coeff + --- H2O 1.3064E-01 -7.3891E-09 5.4773E-08 | Normal Calc + --- NaCl 4.0323E-32 0.0000E+00 8.0519E-11 | Skipped: superconverged DG = 8.052E-11 + --- Cl- 5.4018E-08 8.2067E-07 -3.0362E+01 | Normal calc: diag adjusted from 3.70244e+07 to 3.6997e+07 due to act coeff + --- H2 2.5006E-11 2.2810E-10 -2.7365E+01 | Normal Calc + --- O2 5.5000E-49 0.0000E+00 8.1852E+01 | Skipped: IC = 0 and DG >0: 8.185E+01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Full Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.3307E-11 8.6993E-11 7.3686E-11 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01-9.6761E-09 | Normal Major Calc + --- H+ 1 4.8432E-11 2.5405E-10 2.0561E-10 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3064E-01-7.3891E-09 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species alternative calc - --- Cl- 1 7.0842E-08 1.1280E-06 1.0572E-06 | Normal Major Calc - --- H2 1 2.4675E-11 2.5008E-10 2.2541E-10 | Normal Major Calc - --- O2 0 4.9406E-83 1.4771E-84-4.7929E-83 | minor species alternative calc - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.0572E-06 | + --- Cl- 1 5.4018E-08 8.7468E-07 8.2067E-07 | Normal Major Calc + --- H2 1 2.5006E-11 2.5310E-10 2.2810E-10 | Normal Major Calc + --- O2 0 5.5000E-49 5.5000E-59-5.5000E-49 | minor species alternative calc + --- NaCl(S) c 5.0000E+00 5.0000E+00-8.2067E-07 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00 9.1516E-09 | - --- Na+ c 7.0842E-08 1.1280E-06 1.0572E-06 | - --- OH- c 1.3307E-11 8.6993E-11 7.3686E-11 | - --- OH c 4.9351E-11 5.0017E-10 4.5082E-10 | + --- H2O(L) c 1.8694E+00 1.8694E+00 6.7273E-09 | + --- Na+ c 5.4018E-08 8.7468E-07 8.2067E-07 | + --- OH- c 4.8432E-11 2.5405E-10 2.0561E-10 | + --- OH c 5.0012E-11 5.0620E-10 4.5619E-10 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243955007E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123244229082E+03 - --- subroutine FORCE: Beginning Slope = -3.15321e-05 - --- subroutine FORCE: End Slope = -2.5689e-05 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243949950E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123244166932E+03 + --- subroutine FORCE: Beginning Slope = -2.49252e-05 + --- subroutine FORCE: End Slope = -2.03599e-05 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (all species): @@ -2419,33 +1416,33 @@ VCS CALCULATION METHOD --- NaCl(S) 5.000000E+00 4.999999E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 --- H2O(L) 1.869362E+00 1.869362E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 7.084247E-08 1.128011E-06 -1.170495E+02 -1.142868E+02 - --- OH- 1.330678E-11 8.699302E-11 -1.131370E+02 -1.112645E+02 - --- OH 4.935077E-11 5.001691E-10 -1.166375E+02 -1.143216E+02 + --- Na+ 5.401842E-08 8.746840E-07 -1.173204E+02 -1.145403E+02 + --- OH- 4.843231E-11 2.540464E-10 -1.118449E+02 -1.101920E+02 + --- OH 5.001197E-11 5.062047E-10 -1.166242E+02 -1.143096E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.330678E-11 8.699302E-11 -2.165351E+01 -1.978099E+01 -1.107499E+01 -7.329963E+00 - --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 7.172578E-08 1.128304E-06 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 1.132889E-10 2.292097E-09 - --- Cl- 1 7.084247E-08 1.128011E-06 -8.728762E+01 -8.452491E+01 -2.982031E+01 -2.429489E+01 - --- H2 1 2.467539E-11 2.500846E-10 -4.156087E+01 -3.924488E+01 -2.740494E+01 -2.045696E+01 - --- O2 0 4.940631E-83 1.477110E-84 -2.156092E+02 -2.191192E+02 3.509991E+00 -9.263974E+00 - --- Norms of Delta G(): 1.720105E+01 1.383401E+01 + --- H+ 1 4.843231E-11 2.540464E-10 -2.036140E+01 -1.870850E+01 -8.490778E+00 -5.184988E+00 + --- H2O 1 1.306375E-01 1.306375E-01 -1.237155E+02 -1.237155E+02 5.477268E-08 8.762514E-07 + --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 8.051870E-11 1.703711E-09 + --- Cl- 1 5.401842E-08 8.746840E-07 -8.755854E+01 -8.477846E+01 -3.036215E+01 -2.480199E+01 + --- H2 1 2.500598E-11 2.531024E-10 -4.154756E+01 -3.923288E+01 -2.736502E+01 -2.042098E+01 + --- O2 0 5.499996E-49 5.500000E-59 -1.372140E+02 -1.602399E+02 8.185190E+01 4.956734E+01 + --- Norms of Delta G(): 3.751118E+01 2.420730E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693647E+00 + --- NaCl_electrolyte = 1.8693642E+00 --- air = 4.1306375E+00 - --- NaCl(S) = 4.9999989E+00 + --- NaCl(S) = 4.9999991E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123243955007E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123244229082E+03 - --- Increment counter increased, step is accepted: 28 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123243949950E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123244166932E+03 + --- Increment counter increased, step is accepted: 14 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Reevaluate major-minor status of noncomponents: --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 28, Iterations since last evaluation of optimal basis = 20 (only major species) + Iteration = 14, Iterations since last evaluation of optimal basis = 12 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -2457,69 +1454,69 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 8.6993E-11 3.1883E-10 -7.3300E+00 | Normal calc: diag adjusted from 2.29904e+10 to 2.29903e+10 due to act coeff - --- H2O 1.3064E-01 -1.5221E-07 1.1283E-06 | Normal calc: diag adjusted from 7.41268 to 7.41268 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 2.2921E-09 | Skipped: IC = 0 and DG >0: 2.292E-09 - --- Cl- 1.1280E-06 1.3748E-05 -2.4295E+01 | Normal calc: diag adjusted from 1.77303e+06 to 1.7671e+06 due to act coeff - --- H2 2.5008E-10 1.7053E-09 -2.0457E+01 | Normal Calc - --- O2 1.4771E-84 1.3684E-83 -9.2640E+00 | Normal Calc + --- H+ 2.5405E-10 6.5861E-10 -5.1850E+00 | Normal calc: diag adjusted from 7.87258e+09 to 7.87257e+09 due to act coeff + --- H2O 1.3064E-01 -1.1821E-07 8.7625E-07 | Normal calc: diag adjusted from 7.41267 to 7.41267 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 1.7037E-09 | Skipped: IC = 0 and DG >0: 1.704E-09 + --- Cl- 8.7468E-07 1.0879E-05 -2.4802E+01 | Normal calc: diag adjusted from 2.28654e+06 to 2.27979e+06 due to act coeff + --- H2 2.5310E-10 1.7229E-09 -2.0421E+01 | Normal Calc + --- O2 5.5000E-59 0.0000E+00 4.9567E+01 | Skipped: IC = 0 and DG >0: 4.957E+01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 8.6993E-11 4.0582E-10 3.1883E-10 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01-1.5221E-07 | Normal Major Calc + --- H+ 1 2.5405E-10 9.1266E-10 6.5861E-10 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3064E-01-1.1821E-07 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.1280E-06 1.4876E-05 1.3748E-05 | Normal Major Calc - --- H2 1 2.5008E-10 1.9554E-09 1.7053E-09 | Normal Major Calc - --- O2 0 1.4771E-84 1.4771E-84 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 5.0000E+00-1.3748E-05 | + --- Cl- 1 8.7468E-07 1.1754E-05 1.0879E-05 | Normal Major Calc + --- H2 1 2.5310E-10 1.9760E-09 1.7229E-09 | Normal Major Calc + --- O2 0 5.5000E-59 5.5000E-59 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 5.0000E+00-1.0879E-05 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00 1.4848E-07 | - --- Na+ c 1.1280E-06 1.4876E-05 1.3748E-05 | - --- OH- c 8.6993E-11 4.0582E-10 3.1883E-10 | - --- OH c 5.0017E-10 3.9108E-09 3.4106E-09 | + --- H2O(L) c 1.8694E+00 1.8694E+00 1.1411E-07 | + --- Na+ c 8.7468E-07 1.1754E-05 1.0879E-05 | + --- OH- c 2.5405E-10 9.1266E-10 6.5861E-10 | + --- OH c 5.0620E-10 3.9519E-09 3.4457E-09 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123244229082E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123247079927E+03 - --- subroutine FORCE: Beginning Slope = -0.000334054 - --- subroutine FORCE: End Slope = -0.000263593 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123244166932E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123246474310E+03 + --- subroutine FORCE: Beginning Slope = -0.000269861 + --- subroutine FORCE: End Slope = -0.000213655 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.999999E+00 4.999985E+00 -1.745168E+02 -1.745168E+02 + --- NaCl(S) 4.999999E+00 4.999988E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 --- H2O(L) 1.869362E+00 1.869363E+00 -1.237155E+02 -1.237155E+02 - --- Na+ 1.128011E-06 1.487645E-05 -1.142868E+02 -1.117247E+02 - --- OH- 8.699302E-11 4.058209E-10 -1.112645E+02 -1.097417E+02 - --- OH 5.001691E-10 3.910816E-09 -1.143216E+02 -1.122650E+02 + --- Na+ 8.746840E-07 1.175373E-05 -1.145403E+02 -1.119577E+02 + --- OH- 2.540464E-10 9.126609E-10 -1.101920E+02 -1.089286E+02 + --- OH 5.062047E-10 3.951936E-09 -1.143096E+02 -1.122545E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 8.699302E-11 4.058209E-10 -1.978099E+01 -1.825801E+01 -7.329963E+00 -4.284166E+00 - --- H2O 1 1.306375E-01 1.306374E-01 -1.237155E+02 -1.237155E+02 1.128304E-06 1.458563E-05 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 2.292097E-09 3.790328E-08 - --- Cl- 1 1.128011E-06 1.487645E-05 -8.452491E+01 -8.196283E+01 -2.429489E+01 -1.917072E+01 - --- H2 1 2.500846E-10 1.955408E-09 -3.924488E+01 -3.718832E+01 -2.045696E+01 -1.428727E+01 - --- O2 0 1.477110E-84 1.477110E-84 -2.191192E+02 -2.191192E+02 -9.263974E+00 -1.749022E+01 - --- Norms of Delta G(): 1.383401E+01 1.221955E+01 + --- H+ 1 2.540464E-10 9.126609E-10 -1.870850E+01 -1.744499E+01 -5.184988E+00 -2.658091E+00 + --- H2O 1 1.306375E-01 1.306374E-01 -1.237155E+02 -1.237155E+02 8.762514E-07 1.155212E-05 + --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 1.703711E-09 2.907026E-08 + --- Cl- 1 8.746840E-07 1.175373E-05 -8.477846E+01 -8.219584E+01 -2.480199E+01 -1.963675E+01 + --- H2 1 2.531024E-10 1.975968E-09 -3.923288E+01 -3.717786E+01 -2.042098E+01 -1.425589E+01 + --- O2 0 5.500000E-59 5.500000E-59 -1.602399E+02 -1.602399E+02 4.956734E+01 4.134723E+01 + --- Norms of Delta G(): 2.420730E+01 1.960226E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8693924E+00 + --- NaCl_electrolyte = 1.8693861E+00 --- air = 4.1306374E+00 - --- NaCl(S) = 4.9999851E+00 + --- NaCl(S) = 4.9999882E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123244229082E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123247079927E+03 - --- Increment counter increased, step is accepted: 29 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123244166932E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123246474310E+03 + --- Increment counter increased, step is accepted: 15 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 29, Iterations since last evaluation of optimal basis = 21 (only major species) + Iteration = 15, Iterations since last evaluation of optimal basis = 13 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -2531,69 +1528,69 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 4.0582E-10 8.6930E-10 -4.2842E+00 | Normal calc: diag adjusted from 4.92828e+09 to 4.92828e+09 due to act coeff - --- H2O 1.3064E-01 -1.9677E-06 1.4586E-05 | Normal calc: diag adjusted from 7.41269 to 7.41269 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 3.7903E-08 | Skipped: IC = 0 and DG >0: 3.790E-08 - --- Cl- 1.4876E-05 1.4428E-04 -1.9171E+01 | Normal calc: diag adjusted from 134439 to 132875 due to act coeff - --- H2 1.9554E-09 9.3125E-09 -1.4287E+01 | Normal calc: diag adjusted from 1.53421e+09 to 1.53421e+09 due to act coeff - --- O2 1.4771E-84 2.5835E-83 -1.7490E+01 | Normal Calc + --- H+ 9.1266E-10 1.2130E-09 -2.6581E+00 | Normal calc: diag adjusted from 2.19139e+09 to 2.19139e+09 due to act coeff + --- H2O 1.3064E-01 -1.5584E-06 1.1552E-05 | Normal calc: diag adjusted from 7.41269 to 7.41269 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 2.9070E-08 | Skipped: IC = 0 and DG >0: 2.907E-08 + --- Cl- 1.1754E-05 1.1662E-04 -1.9637E+01 | Normal calc: diag adjusted from 170157 to 168386 due to act coeff + --- H2 1.9760E-09 9.3897E-09 -1.4256E+01 | Normal calc: diag adjusted from 1.51824e+09 to 1.51824e+09 due to act coeff + --- O2 5.5000E-59 0.0000E+00 4.1347E+01 | Skipped: IC = 0 and DG >0: 4.135E+01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 4.0582E-10 1.2751E-09 8.6930E-10 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3064E-01-1.9677E-06 | Normal Major Calc + --- H+ 1 9.1266E-10 2.1256E-09 1.2130E-09 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3064E-01-1.5584E-06 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.4876E-05 1.5915E-04 1.4428E-04 | Normal Major Calc - --- H2 1 1.9554E-09 1.1268E-08 9.3125E-09 | Normal Major Calc - --- O2 0 1.4771E-84 1.4771E-84 0.0000E+00 | minor species not considered - --- NaCl(S) c 5.0000E+00 4.9998E+00-1.4428E-04 | + --- Cl- 1 1.1754E-05 1.2837E-04 1.1662E-04 | Normal Major Calc + --- H2 1 1.9760E-09 1.1366E-08 9.3897E-09 | Normal Major Calc + --- O2 0 5.5000E-59 5.5000E-59 0.0000E+00 | minor species not considered + --- NaCl(S) c 5.0000E+00 4.9999E+00-1.1662E-04 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00 1.9482E-06 | - --- Na+ c 1.4876E-05 1.5915E-04 1.4428E-04 | - --- OH- c 4.0582E-10 1.2751E-09 8.6930E-10 | - --- OH c 3.9108E-09 2.2536E-08 1.8625E-08 | + --- H2O(L) c 1.8694E+00 1.8694E+00 1.5384E-06 | + --- Na+ c 1.1754E-05 1.2837E-04 1.1662E-04 | + --- OH- c 9.1266E-10 2.1256E-09 1.2130E-09 | + --- OH c 3.9519E-09 2.2731E-08 1.8779E-08 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123247079927E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123270167051E+03 - --- subroutine FORCE: Beginning Slope = -0.00276602 - --- subroutine FORCE: End Slope = -0.0020964 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123246474310E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123265632836E+03 + --- subroutine FORCE: Beginning Slope = -0.00229013 + --- subroutine FORCE: End Slope = -0.00174304 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.999985E+00 4.999841E+00 -1.745168E+02 -1.745168E+02 + --- NaCl(S) 4.999988E+00 4.999872E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869363E+00 1.869365E+00 -1.237155E+02 -1.237157E+02 - --- Na+ 1.487645E-05 1.591530E-04 -1.117247E+02 -1.094042E+02 - --- OH- 4.058209E-10 1.275123E-09 -1.097417E+02 -1.086469E+02 - --- OH 3.910816E-09 2.253577E-08 -1.122650E+02 -1.105136E+02 + --- H2O(L) 1.869363E+00 1.869364E+00 -1.237155E+02 -1.237156E+02 + --- Na+ 1.175373E-05 1.283713E-04 -1.119577E+02 -1.096123E+02 + --- OH- 9.126609E-10 2.125630E-09 -1.089286E+02 -1.081289E+02 + --- OH 3.951936E-09 2.273140E-08 -1.122545E+02 -1.105050E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 4.058209E-10 1.275123E-09 -1.825801E+01 -1.716135E+01 -4.284166E+00 -2.092549E+00 - --- H2O 1 1.306374E-01 1.306354E-01 -1.237155E+02 -1.237155E+02 1.458563E-05 1.504938E-04 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 3.790328E-08 5.074965E-07 - --- Cl- 1 1.487645E-05 1.591530E-04 -8.196283E+01 -7.964236E+01 -1.917072E+01 -1.452980E+01 - --- H2 1 1.955408E-09 1.126789E-08 -3.718832E+01 -3.543696E+01 -1.428727E+01 -9.032891E+00 - --- O2 0 1.477110E-84 1.477110E-84 -2.191192E+02 -2.191192E+02 -1.749022E+01 -2.449596E+01 - --- Norms of Delta G(): 1.221955E+01 1.222797E+01 + --- H+ 1 9.126609E-10 2.125630E-09 -1.744499E+01 -1.664373E+01 -2.658091E+00 -1.056949E+00 + --- H2O 1 1.306374E-01 1.306359E-01 -1.237155E+02 -1.237155E+02 1.155212E-05 1.219229E-04 + --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 2.907026E-08 3.995352E-07 + --- Cl- 1 1.175373E-05 1.283713E-04 -8.219584E+01 -7.985041E+01 -1.963675E+01 -1.494589E+01 + --- H2 1 1.975968E-09 1.136570E-08 -3.717786E+01 -3.542832E+01 -1.425589E+01 -9.007025E+00 + --- O2 0 5.500000E-59 5.500000E-59 -1.602399E+02 -1.602399E+02 4.134723E+01 3.434882E+01 + --- Norms of Delta G(): 1.960226E+01 1.573460E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8696829E+00 - --- air = 4.1306354E+00 - --- NaCl(S) = 4.9998408E+00 + --- NaCl_electrolyte = 1.8696209E+00 + --- air = 4.1306359E+00 + --- NaCl(S) = 4.9998716E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123247079927E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123270167051E+03 - --- Increment counter increased, step is accepted: 30 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123246474310E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123265632836E+03 + --- Increment counter increased, step is accepted: 16 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 30, Iterations since last evaluation of optimal basis = 22 (only major species) + Iteration = 16, Iterations since last evaluation of optimal basis = 14 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -2605,63 +1602,63 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.2751E-09 1.3341E-09 -2.0925E+00 | Normal calc: diag adjusted from 1.56848e+09 to 1.56848e+09 due to act coeff - --- H2O 1.3064E-01 -2.0302E-05 1.5049E-04 | Normal calc: diag adjusted from 7.41289 to 7.41289 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 5.0750E-07 | Skipped: IC = 0 and DG >0: 5.075E-07 - --- Cl- 1.5915E-04 1.1963E-03 -1.4530E+01 | Normal calc: diag adjusted from 12564.4 to 12145.6 due to act coeff - --- H2 1.1268E-08 3.3927E-08 -9.0329E+00 | Normal calc: diag adjusted from 2.66243e+08 to 2.66243e+08 due to act coeff - --- O2 1.4771E-84 3.6183E-83 -2.4496E+01 | Normal Calc + --- H+ 2.1256E-09 1.1233E-09 -1.0569E+00 | Normal calc: diag adjusted from 9.40898e+08 to 9.40897e+08 due to act coeff + --- H2O 1.3064E-01 -1.6448E-05 1.2192E-04 | Normal calc: diag adjusted from 7.41285 to 7.41284 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 3.9954E-07 | Skipped: IC = 0 and DG >0: 3.995E-07 + --- Cl- 1.2837E-04 9.8965E-04 -1.4946E+01 | Normal calc: diag adjusted from 15577.7 to 15102.3 due to act coeff + --- H2 1.1366E-08 3.4124E-08 -9.0070E+00 | Normal calc: diag adjusted from 2.63952e+08 to 2.63952e+08 due to act coeff + --- O2 5.5000E-59 0.0000E+00 3.4349E+01 | Skipped: IC = 0 and DG >0: 3.435E+01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.2751E-09 2.6093E-09 1.3341E-09 | Normal Major Calc - --- H2O 1 1.3064E-01 1.3062E-01-2.0302E-05 | Normal Major Calc + --- H+ 1 2.1256E-09 3.2490E-09 1.1233E-09 | Normal Major Calc + --- H2O 1 1.3064E-01 1.3062E-01-1.6448E-05 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.5915E-04 1.3555E-03 1.1963E-03 | Normal Major Calc - --- H2 1 1.1268E-08 4.5195E-08 3.3927E-08 | Normal Major Calc - --- O2 0 1.4771E-84 1.4771E-84 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.9998E+00 4.9986E+00-1.1963E-03 | + --- Cl- 1 1.2837E-04 1.1180E-03 9.8965E-04 | Normal Major Calc + --- H2 1 1.1366E-08 4.5489E-08 3.4124E-08 | Normal Major Calc + --- O2 0 5.5000E-59 5.5000E-59 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.9999E+00 4.9989E+00-9.8965E-04 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8694E+00 2.0232E-05 | - --- Na+ c 1.5915E-04 1.3555E-03 1.1963E-03 | - --- OH- c 1.2751E-09 2.6093E-09 1.3341E-09 | - --- OH c 2.2536E-08 9.0390E-08 6.7854E-08 | + --- H2O(L) c 1.8694E+00 1.8694E+00 1.6378E-05 | + --- Na+ c 1.2837E-04 1.1180E-03 9.8965E-04 | + --- OH- c 2.1256E-09 3.2490E-09 1.1233E-09 | + --- OH c 2.2731E-08 9.0979E-08 6.8247E-08 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123270167051E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2123411435154E+03 - --- subroutine FORCE: Beginning Slope = -0.0173824 - --- subroutine FORCE: End Slope = -0.0125177 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123265632836E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123386178417E+03 + --- subroutine FORCE: Beginning Slope = -0.0147915 + --- subroutine FORCE: End Slope = -0.0107105 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.999841E+00 4.998645E+00 -1.745168E+02 -1.745168E+02 + --- NaCl(S) 4.999872E+00 4.998882E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307736E+01 - --- H2O(L) 1.869365E+00 1.869385E+00 -1.237157E+02 -1.237169E+02 - --- Na+ 1.591530E-04 1.355459E-03 -1.094042E+02 -1.073710E+02 - --- OH- 1.275123E-09 2.609252E-09 -1.086469E+02 -1.080433E+02 - --- OH 2.253577E-08 9.039017E-08 -1.105136E+02 -1.091246E+02 + --- H2O(L) 1.869364E+00 1.869380E+00 -1.237156E+02 -1.237166E+02 + --- Na+ 1.283713E-04 1.118018E-03 -1.096123E+02 -1.075505E+02 + --- OH- 2.125630E-09 3.248971E-09 -1.081289E+02 -1.078102E+02 + --- OH 2.273140E-08 9.097883E-08 -1.105050E+02 -1.091181E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082322E+02 - --- H+ 1 1.275123E-09 2.609252E-09 -1.716135E+01 -1.654296E+01 -2.092549E+00 -8.693450E-01 - --- H2O 1 1.306354E-01 1.306151E-01 -1.237155E+02 -1.237157E+02 1.504938E-04 1.206932E-03 - --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 5.074965E-07 5.397766E-06 - --- Cl- 1 1.591530E-04 1.355459E-03 -7.964236E+01 -7.760918E+01 -1.452980E+01 -1.046344E+01 - --- H2 1 1.126789E-08 4.519509E-08 -3.543696E+01 -3.404793E+01 -9.032891E+00 -4.863368E+00 - --- O2 0 1.477110E-84 1.477110E-84 -2.191192E+02 -2.191192E+02 -2.449596E+01 -3.005451E+01 - --- Norms of Delta G(): 1.222797E+01 1.314766E+01 + --- H+ 1 2.125630E-09 3.248971E-09 -1.664373E+01 -1.631279E+01 -1.056949E+00 -4.063358E-01 + --- H2O 1 1.306359E-01 1.306194E-01 -1.237155E+02 -1.237156E+02 1.219229E-04 1.002074E-03 + --- NaCl 0 4.032301E-32 4.032301E-32 -1.745168E+02 -1.745168E+02 3.995352E-07 4.356599E-06 + --- Cl- 1 1.283713E-04 1.118018E-03 -7.985041E+01 -7.778867E+01 -1.494589E+01 -1.082240E+01 + --- H2 1 1.136570E-08 4.548942E-08 -3.542832E+01 -3.404144E+01 -9.007025E+00 -4.844370E+00 + --- O2 0 5.500000E-59 5.500000E-59 -1.602399E+02 -1.602399E+02 3.434882E+01 2.879929E+01 + --- Norms of Delta G(): 1.573460E+01 1.271585E+01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8720957E+00 - --- air = 4.1306152E+00 - --- NaCl(S) = 4.9986445E+00 + --- NaCl_electrolyte = 1.8716165E+00 + --- air = 4.1306196E+00 + --- NaCl(S) = 4.9988820E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123270167051E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2123411435154E+03 - --- Increment counter increased, step is accepted: 31 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123265632836E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123386178417E+03 + --- Increment counter increased, step is accepted: 17 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed @@ -2669,7 +1666,7 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for minor noncomponents ============================================================================================================== - Iteration = 31, Iterations since last evaluation of optimal basis = 23 (all species) + Iteration = 17, Iterations since last evaluation of optimal basis = 15 (all species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -2681,286 +1678,286 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 2.6093E-09 1.1342E-09 -8.6934E-01 | Normal calc: diag adjusted from 7.66503e+08 to 7.66503e+08 due to act coeff - --- H2O 1.3062E-01 -1.6278E-04 1.2069E-03 | Normal calc: diag adjusted from 7.41476 to 7.41471 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 5.3978E-06 | Skipped: IC = 0 and DG >0: 5.398E-06 - --- Cl- 1.3555E-03 7.6228E-03 -1.0463E+01 | Normal calc: diag adjusted from 1473.38 to 1372.64 due to act coeff - --- H2 4.5195E-08 7.3267E-08 -4.8634E+00 | Normal calc: diag adjusted from 6.63789e+07 to 6.63789e+07 due to act coeff - --- O2 1.4771E-84 4.4394E-83 -3.0055E+01 | Normal Calc + --- H+ 3.2490E-09 6.6009E-10 -4.0634E-01 | Normal calc: diag adjusted from 6.15579e+08 to 6.15579e+08 due to act coeff + --- H2O 1.3062E-01 -1.3515E-04 1.0021E-03 | Normal calc: diag adjusted from 7.41437 to 7.41433 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 4.3566E-06 | Skipped: IC = 0 and DG >0: 4.357E-06 + --- Cl- 1.1180E-03 6.4793E-03 -1.0822E+01 | Normal calc: diag adjusted from 1786.74 to 1670.3 due to act coeff + --- H2 4.5489E-08 7.3456E-08 -4.8444E+00 | Normal calc: diag adjusted from 6.59494e+07 to 6.59494e+07 due to act coeff + --- O2 5.5000E-59 0.0000E+00 2.8799E+01 | Skipped: IC = 0 and DG >0: 2.880E+01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Full Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 2.6093E-09 3.7434E-09 1.1342E-09 | Normal Major Calc - --- H2O 1 1.3062E-01 1.3045E-01-1.6278E-04 | Normal Major Calc - --- NaCl 0 4.0323E-32 4.0323E-32-2.1765E-37 | minor species alternative calc - --- Cl- 1 1.3555E-03 8.9783E-03 7.6228E-03 | Normal Major Calc - --- H2 1 4.5195E-08 1.1846E-07 7.3267E-08 | Normal Major Calc - --- O2 0 1.4771E-84 1.6669E-71 1.6669E-71 | minor species alternative calc - --- NaCl(S) c 4.9986E+00 4.9910E+00-7.6228E-03 | + --- H+ 1 3.2490E-09 3.9091E-09 6.6009E-10 | Normal Major Calc + --- H2O 1 1.3062E-01 1.3048E-01-1.3515E-04 | Normal Major Calc + --- NaCl 0 4.0323E-32 4.0323E-32-1.7567E-37 | minor species alternative calc + --- Cl- 1 1.1180E-03 7.5973E-03 6.4793E-03 | Normal Major Calc + --- H2 1 4.5489E-08 1.1895E-07 7.3456E-08 | Normal Major Calc + --- O2 0 5.5000E-59 5.5000E-69-5.5000E-59 | minor species alternative calc + --- NaCl(S) c 4.9989E+00 4.9924E+00-6.4793E-03 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8694E+00 1.8695E+00 1.6263E-04 | - --- Na+ c 1.3555E-03 8.9783E-03 7.6228E-03 | - --- OH- c 2.6093E-09 3.7434E-09 1.1342E-09 | - --- OH c 9.0390E-08 2.3692E-07 1.4653E-07 | + --- H2O(L) c 1.8694E+00 1.8695E+00 1.3501E-04 | + --- Na+ c 1.1180E-03 7.5973E-03 6.4793E-03 | + --- OH- c 3.2490E-09 3.9091E-09 6.6009E-10 | + --- OH c 9.0979E-08 2.3789E-07 1.4691E-07 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2123411435154E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2124036905784E+03 - --- subroutine FORCE: Beginning Slope = -0.0797618 - --- subroutine FORCE: End Slope = -0.0532858 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123386178417E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2123938322437E+03 + --- subroutine FORCE: Beginning Slope = -0.0701224 + --- subroutine FORCE: End Slope = -0.0472713 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (all species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.998645E+00 4.991022E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307732E+01 - --- H2O(L) 1.869385E+00 1.869547E+00 -1.237169E+02 -1.237244E+02 - --- Na+ 1.355459E-03 8.978306E-03 -1.073710E+02 -1.056344E+02 - --- OH- 2.609252E-09 3.743422E-09 -1.080433E+02 -1.078575E+02 - --- OH 9.039017E-08 2.369237E-07 -1.091246E+02 -1.081610E+02 + --- NaCl(S) 4.998882E+00 4.992403E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307736E+01 -2.307733E+01 + --- H2O(L) 1.869380E+00 1.869515E+00 -1.237166E+02 -1.237230E+02 + --- Na+ 1.118018E-03 7.597348E-03 -1.075505E+02 -1.057871E+02 + --- OH- 3.248971E-09 3.909058E-09 -1.078102E+02 -1.077962E+02 + --- OH 9.097883E-08 2.378906E-07 -1.091181E+02 -1.081569E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082322E+02 -5.082321E+02 - --- H+ 1 2.609252E-09 3.743422E-09 -1.654296E+01 -1.626830E+01 -8.693450E-01 -4.014913E-01 - --- H2O 1 1.306151E-01 1.304523E-01 -1.237157E+02 -1.237169E+02 1.206932E-03 7.471845E-03 - --- NaCl 0 4.032301E-32 4.032280E-32 -1.745168E+02 -1.745167E+02 5.397766E-06 3.935463E-05 - --- Cl- 1 1.355459E-03 8.978306E-03 -7.760918E+01 -7.587251E+01 -1.046344E+01 -6.990093E+00 - --- H2 1 4.519509E-08 1.184619E-07 -3.404793E+01 -3.308429E+01 -4.863368E+00 -1.957496E+00 - --- O2 0 1.477110E-84 1.666946E-71 -2.191192E+02 -1.890646E+02 -3.005451E+01 -3.869474E+00 - --- Norms of Delta G(): 1.314766E+01 3.362223E+00 + --- H+ 1 3.248971E-09 3.909058E-09 -1.631279E+01 -1.622271E+01 -4.063358E-01 -2.959275E-01 + --- H2O 1 1.306194E-01 1.304843E-01 -1.237156E+02 -1.237166E+02 1.002074E-03 6.357777E-03 + --- NaCl 0 4.032301E-32 4.032284E-32 -1.745168E+02 -1.745168E+02 4.356599E-06 3.266712E-05 + --- Cl- 1 1.118018E-03 7.597348E-03 -7.778867E+01 -7.602524E+01 -1.082240E+01 -7.295550E+00 + --- H2 1 4.548942E-08 1.189453E-07 -3.404144E+01 -3.308022E+01 -4.844370E+00 -1.948004E+00 + --- O2 0 5.500000E-59 5.499999E-69 -1.602399E+02 -1.832657E+02 2.879929E+01 1.915886E+00 + --- Norms of Delta G(): 1.271585E+01 3.182714E+00 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 1.8875040E+00 - --- air = 4.1304527E+00 - --- NaCl(S) = 4.9910217E+00 + --- NaCl_electrolyte = 1.8847102E+00 + --- air = 4.1304846E+00 + --- NaCl(S) = 4.9924027E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2123411435154E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2124036905784E+03 - --- Increment counter increased, step is accepted: 32 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123386178417E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2123938322437E+03 + --- Increment counter increased, step is accepted: 18 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Reevaluate major-minor status of noncomponents: --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 32, Iterations since last evaluation of optimal basis = 24 (only major species) + Iteration = 18, Iterations since last evaluation of optimal basis = 16 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.888e+00 + --- NaCl_electrolyte 2 NA 1.885e+00 --- air 2 NA 4.130e+00 - --- NaCl(S) 2 NA 4.991e+00 + --- NaCl(S) 2 NA 4.992e+00 -------------------------------------------------------------- ---------------------------------------------------------------------------------- --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 3.7434E-09 7.5148E-10 -4.0149E-01 | Normal calc: diag adjusted from 5.3427e+08 to 5.3427e+08 due to act coeff - --- H2O 1.3045E-01 -1.0059E-03 7.4718E-03 | Normal calc: diag adjusted from 7.42862 to 7.42823 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 3.9355E-05 | Skipped: IC = 0 and DG >0: 3.935E-05 - --- Cl- 8.9783E-03 3.4285E-02 -6.9901E+00 | Normal calc: diag adjusted from 220.64 to 203.882 due to act coeff - --- H2 1.1846E-07 7.7296E-08 -1.9575E+00 | Normal calc: diag adjusted from 2.53246e+07 to 2.53246e+07 due to act coeff - --- O2 1.6669E-71 6.4502E-71 -3.8695E+00 | Normal Calc + --- H+ 3.9091E-09 5.7840E-10 -2.9593E-01 | Normal calc: diag adjusted from 5.11632e+08 to 5.11632e+08 due to act coeff + --- H2O 1.3048E-01 -8.5619E-04 6.3578E-03 | Normal calc: diag adjusted from 7.42597 to 7.42563 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 3.2667E-05 | Skipped: IC = 0 and DG >0: 3.267E-05 + --- Cl- 7.5973E-03 3.0321E-02 -7.2956E+00 | Normal calc: diag adjusted from 261.127 to 240.614 due to act coeff + --- H2 1.1895E-07 7.7235E-08 -1.9480E+00 | Normal calc: diag adjusted from 2.52217e+07 to 2.52217e+07 due to act coeff + --- O2 5.5000E-69 0.0000E+00 1.9159E+00 | Skipped: IC = 0 and DG >0: 1.916E+00 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 3.7434E-09 4.4949E-09 7.5148E-10 | Normal Major Calc - --- H2O 1 1.3045E-01 1.2945E-01-1.0059E-03 | Normal Major Calc + --- H+ 1 3.9091E-09 4.4875E-09 5.7840E-10 | Normal Major Calc + --- H2O 1 1.3048E-01 1.2963E-01-8.5619E-04 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 8.9783E-03 4.3263E-02 3.4285E-02 | Normal Major Calc - --- H2 1 1.1846E-07 1.9576E-07 7.7296E-08 | Normal Major Calc - --- O2 0 1.6669E-71 1.6669E-71 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.9910E+00 4.9567E+00-3.4285E-02 | + --- Cl- 1 7.5973E-03 3.7918E-02 3.0321E-02 | Normal Major Calc + --- H2 1 1.1895E-07 1.9618E-07 7.7235E-08 | Normal Major Calc + --- O2 0 5.5000E-69 5.5000E-69 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.9924E+00 4.9621E+00-3.0321E-02 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8695E+00 1.8706E+00 1.0057E-03 | - --- Na+ c 8.9783E-03 4.3263E-02 3.4285E-02 | - --- OH- c 3.7434E-09 4.4949E-09 7.5148E-10 | - --- OH c 2.3692E-07 3.9152E-07 1.5459E-07 | + --- H2O(L) c 1.8695E+00 1.8704E+00 8.5604E-04 | + --- Na+ c 7.5973E-03 3.7918E-02 3.0321E-02 | + --- OH- c 3.9091E-09 4.4875E-09 5.7840E-10 | + --- OH c 2.3789E-07 3.9236E-07 1.5447E-07 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2124036905784E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2125804647719E+03 - --- subroutine FORCE: Beginning Slope = -0.239663 - --- subroutine FORCE: End Slope = -0.137977 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123938322437E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2125582635496E+03 + --- subroutine FORCE: Beginning Slope = -0.221211 + --- subroutine FORCE: End Slope = -0.129981 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.991022E+00 4.956737E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307732E+01 -2.307707E+01 - --- H2O(L) 1.869547E+00 1.870553E+00 -1.237244E+02 -1.237594E+02 - --- Na+ 8.978306E-03 4.326329E-02 -1.056344E+02 -1.041510E+02 - --- OH- 3.743422E-09 4.494898E-09 -1.078575E+02 -1.078550E+02 - --- OH 2.369237E-07 3.915162E-07 -1.081610E+02 -1.076584E+02 + --- NaCl(S) 4.992403E+00 4.962082E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307733E+01 -2.307712E+01 + --- H2O(L) 1.869515E+00 1.870372E+00 -1.237230E+02 -1.237537E+02 + --- Na+ 7.597348E-03 3.791789E-02 -1.057871E+02 -1.042823E+02 + --- OH- 3.909058E-09 4.487457E-09 -1.077962E+02 -1.078418E+02 + --- OH 2.378906E-07 3.923612E-07 -1.081569E+02 -1.076563E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082321E+02 -5.082319E+02 - --- H+ 1 3.743422E-09 4.494898E-09 -1.626830E+01 -1.589200E+01 -4.014913E-01 1.233810E-02 - --- H2O 1 1.304523E-01 1.294465E-01 -1.237169E+02 -1.237244E+02 7.471845E-03 3.497223E-02 - --- NaCl 0 4.032280E-32 4.032280E-32 -1.745167E+02 -1.745165E+02 3.935463E-05 2.828538E-04 - --- Cl- 1 8.978306E-03 4.326329E-02 -7.587251E+01 -7.438916E+01 -6.990093E+00 -4.023389E+00 - --- H2 1 1.184619E-07 1.957581E-07 -3.308429E+01 -3.258175E+01 -1.957496E+00 -3.799053E-01 - --- O2 0 1.666946E-71 1.666946E-71 -1.890646E+02 -1.890644E+02 -3.869474E+00 -5.949354E+00 - --- Norms of Delta G(): 3.362223E+00 2.936216E+00 + --- H+ 1 3.909058E-09 4.487457E-09 -1.622271E+01 -1.593581E+01 -2.959275E-01 -2.398498E-02 + --- H2O 1 1.304843E-01 1.296281E-01 -1.237166E+02 -1.237230E+02 6.357777E-03 3.063772E-02 + --- NaCl 0 4.032284E-32 4.032284E-32 -1.745168E+02 -1.745165E+02 3.266712E-05 2.399190E-04 + --- Cl- 1 7.597348E-03 3.791789E-02 -7.602524E+01 -7.452048E+01 -7.295550E+00 -4.286032E+00 + --- H2 1 1.189453E-07 1.961806E-07 -3.308022E+01 -3.257964E+01 -1.948004E+00 -3.849543E-01 + --- O2 0 5.499999E-69 5.499999E-69 -1.832657E+02 -1.832655E+02 1.915886E+00 -1.475360E-01 + --- Norms of Delta G(): 3.182714E+00 1.757913E+00 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 1.9570797E+00 - --- air = 4.1294471E+00 - --- NaCl(S) = 4.9567367E+00 + --- NaCl_electrolyte = 1.9462073E+00 + --- air = 4.1296287E+00 + --- NaCl(S) = 4.9620821E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2124036905784E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2125804647719E+03 - --- Increment counter increased, step is accepted: 33 + --- Total Old Dimensionless Gibbs Free Energy = -1.2123938322437E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2125582635496E+03 + --- Increment counter increased, step is accepted: 19 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 33, Iterations since last evaluation of optimal basis = 25 (only major species) + Iteration = 19, Iterations since last evaluation of optimal basis = 17 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 1.957e+00 - --- air 2 NA 4.129e+00 - --- NaCl(S) 2 NA 4.957e+00 + --- NaCl_electrolyte 2 NA 1.946e+00 + --- air 2 NA 4.130e+00 + --- NaCl(S) 2 NA 4.962e+00 -------------------------------------------------------------- ---------------------------------------------------------------------------------- --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 4.4949E-09 -2.7729E-11 1.2338E-02 | Normal calc: diag adjusted from 4.44949e+08 to 4.44949e+08 due to act coeff - --- H2O 1.2945E-01 -4.6581E-03 3.4972E-02 | Normal calc: diag adjusted from 7.50667 to 7.50791 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 2.8285E-04 | Skipped: IC = 0 and DG >0: 2.829E-04 - --- Cl- 4.3263E-02 8.6542E-02 -4.0234E+00 | Normal calc: diag adjusted from 44.1847 to 46.4905 due to act coeff - --- H2 1.9576E-07 2.4790E-08 -3.7991E-01 | Normal calc: diag adjusted from 1.5325e+07 to 1.5325e+07 due to act coeff - --- O2 1.6669E-71 9.9173E-71 -5.9494E+00 | Normal Calc + --- H+ 4.4875E-09 5.3816E-11 -2.3985E-02 | Normal calc: diag adjusted from 4.45687e+08 to 4.45687e+08 due to act coeff + --- H2O 1.2963E-01 -4.0885E-03 3.0638E-02 | Normal calc: diag adjusted from 7.49306 to 7.49364 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 2.3992E-04 | Skipped: IC = 0 and DG >0: 2.399E-04 + --- Cl- 3.7918E-02 8.2257E-02 -4.2860E+00 | Normal calc: diag adjusted from 50.6903 to 52.1053 due to act coeff + --- H2 1.9618E-07 2.5174E-08 -3.8495E-01 | Normal calc: diag adjusted from 1.5292e+07 to 1.5292e+07 due to act coeff + --- O2 5.5000E-69 8.1145E-70 -1.4754E-01 | Normal Calc ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 4.4949E-09 4.4672E-09-2.7729E-11 | Normal Major Calc - --- H2O 1 1.2945E-01 1.2479E-01-4.6581E-03 | Normal Major Calc + --- H+ 1 4.4875E-09 4.5413E-09 5.3816E-11 | Normal Major Calc + --- H2O 1 1.2963E-01 1.2554E-01-4.0885E-03 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 4.3263E-02 1.2981E-01 8.6542E-02 | Normal Major Calc - --- H2 1 1.9576E-07 2.2055E-07 2.4790E-08 | Normal Major Calc - --- O2 0 1.6669E-71 1.6669E-71 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.9567E+00 4.8702E+00-8.6542E-02 | + --- Cl- 1 3.7918E-02 1.2018E-01 8.2257E-02 | Normal Major Calc + --- H2 1 1.9618E-07 2.2135E-07 2.5174E-08 | Normal Major Calc + --- O2 0 5.5000E-69 5.5000E-69 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.9621E+00 4.8798E+00-8.2257E-02 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8706E+00 1.8752E+00 4.6580E-03 | - --- Na+ c 4.3263E-02 1.2981E-01 8.6542E-02 | - --- OH- c 4.4949E-09 4.4672E-09-2.7729E-11 | - --- OH c 3.9152E-07 4.4110E-07 4.9580E-08 | + --- H2O(L) c 1.8704E+00 1.8745E+00 4.0884E-03 | + --- Na+ c 3.7918E-02 1.2018E-01 8.2257E-02 | + --- OH- c 4.4875E-09 4.5413E-09 5.3816E-11 | + --- OH c 3.9236E-07 4.4271E-07 5.0347E-08 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2125804647719E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2128061414969E+03 - --- subroutine FORCE: Beginning Slope = -0.348356 - --- subroutine FORCE: End Slope = -0.130673 + --- Total Old Dimensionless Gibbs Free Energy = -1.2125582635496E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2127905822680E+03 + --- subroutine FORCE: Beginning Slope = -0.352682 + --- subroutine FORCE: End Slope = -0.141262 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.956737E+00 4.870194E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307707E+01 -2.307595E+01 - --- H2O(L) 1.870553E+00 1.875211E+00 -1.237594E+02 -1.238684E+02 - --- Na+ 4.326329E-02 1.298055E-01 -1.041510E+02 -1.028914E+02 - --- OH- 4.494898E-09 4.467169E-09 -1.078550E+02 -1.079464E+02 - --- OH 3.915162E-07 4.410959E-07 -1.076584E+02 -1.075381E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082319E+02 -5.082308E+02 - --- H+ 1 4.494898E-09 4.467169E-09 -1.589200E+01 -1.508808E+01 1.233810E-02 8.339246E-01 - --- H2O 1 1.294465E-01 1.247884E-01 -1.237244E+02 -1.237599E+02 3.497223E-02 1.084653E-01 - --- NaCl 0 4.032280E-32 4.032280E-32 -1.745165E+02 -1.745154E+02 2.828538E-04 1.411481E-03 - --- Cl- 1 4.326329E-02 1.298055E-01 -7.438916E+01 -7.312951E+01 -4.023389E+00 -1.504097E+00 - --- H2 1 1.957581E-07 2.205479E-07 -3.258175E+01 -3.246139E+01 -3.799053E-01 1.992113E-01 - --- O2 0 1.666946E-71 1.666946E-71 -1.890644E+02 -1.890632E+02 -5.949354E+00 -6.647706E+00 - --- Norms of Delta G(): 2.936216E+00 2.804793E+00 + --- NaCl(S) 4.962082E+00 4.879825E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307712E+01 -2.307613E+01 + --- H2O(L) 1.870372E+00 1.874460E+00 -1.237537E+02 -1.238545E+02 + --- Na+ 3.791789E-02 1.201751E-01 -1.042823E+02 -1.029955E+02 + --- OH- 4.487457E-09 4.541273E-09 -1.078418E+02 -1.079280E+02 + --- OH 3.923612E-07 4.427082E-07 -1.076563E+02 -1.075346E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082319E+02 -5.082309E+02 + --- H+ 1 4.487457E-09 4.541273E-09 -1.593581E+01 -1.516733E+01 -2.398498E-02 7.591490E-01 + --- H2O 1 1.296281E-01 1.255396E-01 -1.237230E+02 -1.237541E+02 3.063772E-02 1.004058E-01 + --- NaCl 0 4.032284E-32 4.032284E-32 -1.745165E+02 -1.745156E+02 2.399190E-04 1.230431E-03 + --- Cl- 1 3.791789E-02 1.201751E-01 -7.452048E+01 -7.323363E+01 -4.286032E+00 -1.712334E+00 + --- H2 1 1.961806E-07 2.213541E-07 -3.257964E+01 -3.245792E+01 -3.849543E-01 1.818533E-01 + --- O2 0 5.499999E-69 5.499999E-69 -1.832655E+02 -1.832645E+02 -1.475360E-01 -8.350718E-01 + --- Norms of Delta G(): 1.757913E+00 8.415159E-01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 2.1348222E+00 - --- air = 4.1247891E+00 - --- NaCl(S) = 4.8701945E+00 + --- NaCl_electrolyte = 2.1148101E+00 + --- air = 4.1255402E+00 + --- NaCl(S) = 4.8798249E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2125804647719E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2128061414969E+03 - --- Increment counter increased, step is accepted: 34 + --- Total Old Dimensionless Gibbs Free Energy = -1.2125582635496E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2127905822680E+03 + --- Increment counter increased, step is accepted: 20 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 34, Iterations since last evaluation of optimal basis = 26 (only major species) + Iteration = 20, Iterations since last evaluation of optimal basis = 18 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 2.135e+00 - --- air 2 NA 4.125e+00 - --- NaCl(S) 2 NA 4.870e+00 + --- NaCl_electrolyte 2 NA 2.115e+00 + --- air 2 NA 4.126e+00 + --- NaCl(S) 2 NA 4.880e+00 -------------------------------------------------------------- ---------------------------------------------------------------------------------- --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 4.4672E-09 -1.8626E-09 8.3392E-01 | Normal calc: diag adjusted from 4.47711e+08 to 4.47711e+08 due to act coeff - --- H2O 1.2479E-01 -1.3777E-02 1.0847E-01 | Normal calc: diag adjusted from 7.83598 to 7.87315 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 1.4115E-03 | Skipped: IC = 0 and DG >0: 1.411E-03 - --- Cl- 1.2981E-01 7.0641E-02 -1.5041E+00 | Normal calc: diag adjusted from 13.534 to 21.292 due to act coeff - --- H2 2.2055E-07 -1.4645E-08 1.9921E-01 | Normal calc: diag adjusted from 1.36025e+07 to 1.36025e+07 due to act coeff - --- O2 1.6669E-71 1.1081E-70 -6.6477E+00 | Normal Calc + --- H+ 4.5413E-09 -1.7238E-09 7.5915E-01 | Normal calc: diag adjusted from 4.40405e+08 to 4.40405e+08 due to act coeff + --- H2O 1.2554E-01 -1.2849E-02 1.0041E-01 | Normal calc: diag adjusted from 7.78385 to 7.8145 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 1.2304E-03 | Skipped: IC = 0 and DG >0: 1.230E-03 + --- Cl- 1.2018E-01 7.7112E-02 -1.7123E+00 | Normal calc: diag adjusted from 14.751 to 22.2059 due to act coeff + --- H2 2.2135E-07 -1.3418E-08 1.8185E-01 | Normal calc: diag adjusted from 1.35529e+07 to 1.35529e+07 due to act coeff + --- O2 5.5000E-69 4.5929E-69 -8.3507E-01 | Normal Calc ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 4.4672E-09 2.6045E-09-1.8626E-09 | Normal Major Calc - --- H2O 1 1.2479E-01 1.1101E-01-1.3777E-02 | Normal Major Calc + --- H+ 1 4.5413E-09 2.8175E-09-1.7238E-09 | Normal Major Calc + --- H2O 1 1.2554E-01 1.1269E-01-1.2849E-02 | Normal Major Calc --- NaCl 0 4.0323E-32 4.0323E-32 0.0000E+00 | minor species not considered - --- Cl- 1 1.2981E-01 2.0045E-01 7.0641E-02 | Normal Major Calc - --- H2 1 2.2055E-07 2.0590E-07-1.4645E-08 | Normal Major Calc - --- O2 0 1.6669E-71 1.6669E-71 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.8702E+00 4.7996E+00-7.0641E-02 | + --- Cl- 1 1.2018E-01 1.9729E-01 7.7112E-02 | Normal Major Calc + --- H2 1 2.2135E-07 2.0794E-07-1.3418E-08 | Normal Major Calc + --- O2 0 5.5000E-69 5.5000E-69 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.8798E+00 4.8027E+00-7.7112E-02 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8752E+00 1.8890E+00 1.3777E-02 | - --- Na+ c 1.2981E-01 2.0045E-01 7.0641E-02 | - --- OH- c 4.4672E-09 2.6045E-09-1.8626E-09 | - --- OH c 4.4110E-07 4.1181E-07-2.9290E-08 | + --- H2O(L) c 1.8745E+00 1.8873E+00 1.2849E-02 | + --- Na+ c 1.2018E-01 1.9729E-01 7.7112E-02 | + --- OH- c 4.5413E-09 2.8175E-09-1.7238E-09 | + --- OH c 4.4271E-07 4.1587E-07-2.6836E-08 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2128061414969E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2128655084713E+03 - --- subroutine FORCE: Beginning Slope = -0.107746 - --- subroutine FORCE: End Slope = -0.014158 + --- Total Old Dimensionless Gibbs Free Energy = -1.2127905822680E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2128646676327E+03 + --- subroutine FORCE: Beginning Slope = -0.133331 + --- subroutine FORCE: End Slope = -0.0193693 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.870194E+00 4.799553E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307595E+01 -2.307260E+01 - --- H2O(L) 1.875211E+00 1.888988E+00 -1.238684E+02 -1.239838E+02 - --- Na+ 1.298055E-01 2.004470E-01 -1.028914E+02 -1.022288E+02 - --- OH- 4.467169E-09 2.604528E-09 -1.079464E+02 -1.084799E+02 - --- OH 4.410959E-07 4.118054E-07 -1.075381E+02 -1.076034E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082308E+02 -5.082274E+02 - --- H+ 1 4.467169E-09 2.604528E-09 -1.508808E+01 -1.492604E+01 8.339246E-01 5.778205E-01 - --- H2O 1 1.247884E-01 1.110118E-01 -1.237599E+02 -1.238735E+02 1.084653E-01 1.102419E-01 - --- NaCl 0 4.032280E-32 4.032280E-32 -1.745154E+02 -1.745120E+02 1.411481E-03 4.757036E-03 - --- Cl- 1 1.298055E-01 2.004470E-01 -7.312951E+01 -7.246693E+01 -1.504097E+00 -1.789207E-01 - --- H2 1 2.205479E-07 2.059027E-07 -3.246139E+01 -3.252676E+01 1.992113E-01 2.339423E-01 - --- O2 0 1.666946E-71 1.666946E-71 -1.890632E+02 -1.890599E+02 -6.647706E+00 -6.613726E+00 - --- Norms of Delta G(): 2.804793E+00 2.713367E+00 + --- NaCl(S) 4.879825E+00 4.802713E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307613E+01 -2.307301E+01 + --- H2O(L) 1.874460E+00 1.887309E+00 -1.238545E+02 -1.239783E+02 + --- Na+ 1.201751E-01 1.972869E-01 -1.029955E+02 -1.022550E+02 + --- OH- 4.541273E-09 2.817521E-09 -1.079280E+02 -1.084016E+02 + --- OH 4.427082E-07 4.158722E-07 -1.075346E+02 -1.075940E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082309E+02 -5.082278E+02 + --- H+ 1 4.541273E-09 2.817521E-09 -1.516733E+01 -1.487722E+01 7.591490E-01 6.994265E-01 + --- H2O 1 1.255396E-01 1.126909E-01 -1.237541E+02 -1.238589E+02 1.004058E-01 1.193288E-01 + --- NaCl 0 4.032284E-32 4.032284E-32 -1.745156E+02 -1.745124E+02 1.230431E-03 4.349718E-03 + --- Cl- 1 1.201751E-01 1.972869E-01 -7.323363E+01 -7.249312E+01 -1.712334E+00 -2.313017E-01 + --- H2 1 2.213541E-07 2.079361E-07 -3.245792E+01 -3.251734E+01 1.818533E-01 2.511647E-01 + --- O2 0 5.499999E-69 5.499999E-69 -1.832645E+02 -1.832614E+02 -8.350718E-01 -8.418503E-01 + --- Norms of Delta G(): 8.415159E-01 4.705939E-01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 2.2898818E+00 - --- air = 4.1110124E+00 - --- NaCl(S) = 4.7995530E+00 + --- NaCl_electrolyte = 2.2818825E+00 + --- air = 4.1126915E+00 + --- NaCl(S) = 4.8027131E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2128061414969E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2128655084713E+03 - --- Increment counter increased, step is accepted: 35 + --- Total Old Dimensionless Gibbs Free Energy = -1.2127905822680E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2128646676327E+03 + --- Increment counter increased, step is accepted: 21 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed @@ -2968,230 +1965,230 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for minor noncomponents ============================================================================================================== - Iteration = 35, Iterations since last evaluation of optimal basis = 27 (all species) + Iteration = 21, Iterations since last evaluation of optimal basis = 19 (all species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 2.290e+00 - --- air 2 NA 4.111e+00 - --- NaCl(S) 2 NA 4.800e+00 + --- NaCl_electrolyte 2 NA 2.282e+00 + --- air 2 NA 4.113e+00 + --- NaCl(S) 2 NA 4.803e+00 -------------------------------------------------------------- ---------------------------------------------------------------------------------- --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 2.6045E-09 -7.5247E-10 5.7782E-01 | Normal calc: diag adjusted from 7.67894e+08 to 7.67894e+08 due to act coeff - --- H2O 1.1101E-01 -1.2301E-02 1.1024E-01 | Normal calc: diag adjusted from 8.85748 to 8.9619 due to act coeff - --- NaCl 4.0323E-32 0.0000E+00 4.7570E-03 | Skipped: IC = 0 and DG >0: 4.757E-03 - --- Cl- 2.0045E-01 1.0222E-02 -1.7892E-01 | Normal calc: diag adjusted from 8.23088 to 17.5039 due to act coeff - --- H2 2.0590E-07 -1.6056E-08 2.3394E-01 | Normal calc: diag adjusted from 1.457e+07 to 1.457e+07 due to act coeff - --- O2 1.6669E-71 1.1025E-70 -6.6137E+00 | Normal Calc + --- H+ 2.8175E-09 -9.8532E-10 6.9943E-01 | Normal calc: diag adjusted from 7.09844e+08 to 7.09844e+08 due to act coeff + --- H2O 1.1269E-01 -1.3525E-02 1.1933E-01 | Normal calc: diag adjusted from 8.7223 to 8.82315 due to act coeff + --- NaCl 4.0323E-32 0.0000E+00 4.3497E-03 | Skipped: IC = 0 and DG >0: 4.350E-03 + --- Cl- 1.9729E-01 1.3132E-02 -2.3130E-01 | Normal calc: diag adjusted from 8.38458 to 17.6133 due to act coeff + --- H2 2.0794E-07 -1.7409E-08 2.5116E-01 | Normal calc: diag adjusted from 1.44275e+07 to 1.44275e+07 due to act coeff + --- O2 5.5000E-69 4.6302E-69 -8.4185E-01 | Normal Calc ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Full Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 2.6045E-09 1.8521E-09-7.5247E-10 | Normal Major Calc - --- H2O 1 1.1101E-01 9.8711E-02-1.2301E-02 | Normal Major Calc - --- NaCl 0 4.0323E-32 4.0131E-32-1.9136E-34 | minor species alternative calc - --- Cl- 1 2.0045E-01 2.1067E-01 1.0222E-02 | Normal Major Calc - --- H2 1 2.0590E-07 1.8985E-07-1.6056E-08 | Normal Major Calc - --- O2 0 1.6669E-71 1.2423E-68 1.2406E-68 | minor species alternative calc - --- NaCl(S) c 4.7996E+00 4.7893E+00-1.0222E-02 | + --- H+ 1 2.8175E-09 1.8322E-09-9.8532E-10 | Normal Major Calc + --- H2O 1 1.1269E-01 9.9166E-02-1.3525E-02 | Normal Major Calc + --- NaCl 0 4.0323E-32 4.0148E-32-1.7501E-34 | minor species alternative calc + --- Cl- 1 1.9729E-01 2.1042E-01 1.3132E-02 | Normal Major Calc + --- H2 1 2.0794E-07 1.9053E-07-1.7409E-08 | Normal Major Calc + --- O2 0 5.5000E-69 1.2764E-68 7.2636E-69 | minor species alternative calc + --- NaCl(S) c 4.8027E+00 4.7896E+00-1.3132E-02 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.8890E+00 1.9013E+00 1.2301E-02 | - --- Na+ c 2.0045E-01 2.1067E-01 1.0222E-02 | - --- OH- c 2.6045E-09 1.8521E-09-7.5247E-10 | - --- OH c 4.1181E-07 3.7969E-07-3.2113E-08 | + --- H2O(L) c 1.8873E+00 1.9008E+00 1.3525E-02 | + --- Na+ c 1.9729E-01 2.1042E-01 1.3132E-02 | + --- OH- c 2.8175E-09 1.8322E-09-9.8532E-10 | + --- OH c 4.1587E-07 3.8105E-07-3.4817E-08 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2128655084713E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673158693E+03 - --- subroutine FORCE: Beginning Slope = -0.003185 - --- subroutine FORCE: End Slope = -0.000409376 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128646676327E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673025651E+03 + --- subroutine FORCE: Beginning Slope = -0.00465137 + --- subroutine FORCE: End Slope = -0.000598004 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (all species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.799553E+00 4.789331E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.307260E+01 -2.306960E+01 - --- H2O(L) 1.888988E+00 1.901289E+00 -1.239838E+02 -1.240005E+02 - --- Na+ 2.004470E-01 2.106688E-01 -1.022288E+02 -1.021518E+02 - --- OH- 2.604528E-09 1.852053E-09 -1.084799E+02 -1.088236E+02 - --- OH 4.118054E-07 3.796925E-07 -1.076034E+02 -1.076816E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082274E+02 -5.082244E+02 - --- H+ 1 2.604528E-09 1.852053E-09 -1.492604E+01 -1.518236E+01 5.778205E-01 -5.480865E-03 - --- H2O 1 1.110118E-01 9.871063E-02 -1.238735E+02 -1.239880E+02 1.102419E-01 1.248514E-02 - --- NaCl 0 4.032280E-32 4.013143E-32 -1.745120E+02 -1.745138E+02 4.757036E-03 2.996747E-03 - --- Cl- 1 2.004470E-01 2.106688E-01 -7.246693E+01 -7.238998E+01 -1.789207E-01 -2.502438E-02 - --- H2 1 2.059027E-07 1.898463E-07 -3.252676E+01 -3.260495E+01 2.339423E-01 3.274581E-02 - --- O2 0 1.666946E-71 1.242299E-68 -1.890599E+02 -1.824432E+02 -6.613726E+00 2.823857E-01 - --- Norms of Delta G(): 2.713367E+00 1.166441E-01 + --- NaCl(S) 4.802713E+00 4.789581E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.307301E+01 -2.306971E+01 + --- H2O(L) 1.887309E+00 1.900833E+00 -1.239783E+02 -1.240001E+02 + --- Na+ 1.972869E-01 2.104191E-01 -1.022550E+02 -1.021535E+02 + --- OH- 2.817521E-09 1.832197E-09 -1.084016E+02 -1.088342E+02 + --- OH 4.158722E-07 3.810548E-07 -1.075940E+02 -1.076782E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082278E+02 -5.082245E+02 + --- H+ 1 2.817521E-09 1.832197E-09 -1.487722E+01 -1.519494E+01 6.994265E-01 -2.906329E-02 + --- H2O 1 1.126909E-01 9.916639E-02 -1.238589E+02 -1.239835E+02 1.193288E-01 1.660229E-02 + --- NaCl 0 4.032284E-32 4.014783E-32 -1.745124E+02 -1.745135E+02 4.349718E-03 3.293917E-03 + --- Cl- 1 1.972869E-01 2.104191E-01 -7.249312E+01 -7.239168E+01 -2.313017E-01 -2.843889E-02 + --- H2 1 2.079361E-07 1.905274E-07 -3.251734E+01 -3.260148E+01 2.511647E-01 4.239981E-02 + --- O2 0 5.499999E-69 1.276361E-68 -1.832614E+02 -1.824162E+02 -8.418503E-01 2.961998E-01 + --- Norms of Delta G(): 4.705939E-01 1.234720E-01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 2.3226266E+00 - --- air = 4.0987112E+00 - --- NaCl(S) = 4.7893312E+00 + --- NaCl_electrolyte = 2.3216714E+00 + --- air = 4.0991670E+00 + --- NaCl(S) = 4.7895809E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2128655084713E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2128673158693E+03 - --- Increment counter increased, step is accepted: 36 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128646676327E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2128673025651E+03 + --- Increment counter increased, step is accepted: 22 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Reevaluate major-minor status of noncomponents: --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 36, Iterations since last evaluation of optimal basis = 28 (only major species) + Iteration = 22, Iterations since last evaluation of optimal basis = 20 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- - --- NaCl_electrolyte 2 NA 2.323e+00 + --- NaCl_electrolyte 2 NA 2.322e+00 --- air 2 NA 4.099e+00 - --- NaCl(S) 2 NA 4.789e+00 + --- NaCl(S) 2 NA 4.790e+00 -------------------------------------------------------------- ---------------------------------------------------------------------------------- --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8521E-09 5.0754E-12 -5.4809E-03 | Normal calc: diag adjusted from 1.07988e+09 to 1.07988e+09 due to act coeff - --- H2O 9.8711E-02 -1.2365E-03 1.2485E-02 | Normal calc: diag adjusted from 9.98205 to 10.097 due to act coeff - --- NaCl 4.0131E-32 0.0000E+00 2.9967E-03 | Skipped: IC = 0 and DG >0: 2.997E-03 - --- Cl- 2.1067E-01 1.4605E-03 -2.5024E-02 | Normal calc: diag adjusted from 7.77139 to 17.1337 due to act coeff - --- H2 1.8985E-07 -2.0722E-09 3.2746E-02 | Normal calc: diag adjusted from 1.58023e+07 to 1.58023e+07 due to act coeff - --- O2 1.2423E-68 0.0000E+00 2.8239E-01 | Skipped: IC = 0 and DG >0: 2.824E-01 + --- H+ 1.8322E-09 2.6625E-11 -2.9063E-02 | Normal calc: diag adjusted from 1.09159e+09 to 1.09159e+09 due to act coeff + --- H2O 9.9166E-02 -1.6519E-03 1.6602E-02 | Normal calc: diag adjusted from 9.93547 to 10.0502 due to act coeff + --- NaCl 4.0148E-32 0.0000E+00 3.2939E-03 | Skipped: IC = 0 and DG >0: 3.294E-03 + --- Cl- 2.1042E-01 1.6589E-03 -2.8439E-02 | Normal calc: diag adjusted from 7.78194 to 17.1433 due to act coeff + --- H2 1.9053E-07 -2.6928E-09 4.2400E-02 | Normal calc: diag adjusted from 1.57458e+07 to 1.57458e+07 due to act coeff + --- O2 1.2764E-68 0.0000E+00 2.9620E-01 | Skipped: IC = 0 and DG >0: 2.962E-01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8521E-09 1.8571E-09 5.0754E-12 | Normal Major Calc - --- H2O 1 9.8711E-02 9.7474E-02-1.2365E-03 | Normal Major Calc - --- NaCl 0 4.0131E-32 4.0131E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.1067E-01 2.1213E-01 1.4605E-03 | Normal Major Calc - --- H2 1 1.8985E-07 1.8777E-07-2.0722E-09 | Normal Major Calc - --- O2 0 1.2423E-68 1.2423E-68 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.7893E+00 4.7879E+00-1.4605E-03 | + --- H+ 1 1.8322E-09 1.8588E-09 2.6625E-11 | Normal Major Calc + --- H2O 1 9.9166E-02 9.7514E-02-1.6519E-03 | Normal Major Calc + --- NaCl 0 4.0148E-32 4.0148E-32 0.0000E+00 | minor species not considered + --- Cl- 1 2.1042E-01 2.1208E-01 1.6589E-03 | Normal Major Calc + --- H2 1 1.9053E-07 1.8783E-07-2.6928E-09 | Normal Major Calc + --- O2 0 1.2764E-68 1.2764E-68 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.7896E+00 4.7879E+00-1.6589E-03 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9013E+00 1.9025E+00 1.2365E-03 | - --- Na+ c 2.1067E-01 2.1213E-01 1.4605E-03 | - --- OH- c 1.8521E-09 1.8571E-09 5.0754E-12 | - --- OH c 3.7969E-07 3.7555E-07-4.1444E-09 | + --- H2O(L) c 1.9008E+00 1.9025E+00 1.6519E-03 | + --- Na+ c 2.1042E-01 2.1208E-01 1.6589E-03 | + --- OH- c 1.8322E-09 1.8588E-09 2.6625E-11 | + --- OH c 3.8105E-07 3.7567E-07-5.3856E-09 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673158693E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673452792E+03 - --- subroutine FORCE: Beginning Slope = -5.19871e-05 - --- subroutine FORCE: End Slope = -6.82006e-06 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673025651E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673450210E+03 + --- subroutine FORCE: Beginning Slope = -7.46032e-05 + --- subroutine FORCE: End Slope = -1.02617e-05 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.789331E+00 4.787871E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.306960E+01 -2.306930E+01 - --- H2O(L) 1.901289E+00 1.902526E+00 -1.240005E+02 -1.240030E+02 - --- Na+ 2.106688E-01 2.121293E-01 -1.021518E+02 -1.021405E+02 - --- OH- 1.852053E-09 1.857128E-09 -1.088236E+02 -1.088209E+02 - --- OH 3.796925E-07 3.755481E-07 -1.076816E+02 -1.076923E+02 - --- CO2 0.000000E+00 0.000000E+00 -5.082244E+02 -5.082241E+02 - --- H+ 1 1.852053E-09 1.857128E-09 -1.518236E+01 -1.516675E+01 -5.480865E-03 1.532344E-02 - --- H2O 1 9.871063E-02 9.747411E-02 -1.239880E+02 -1.240003E+02 1.248514E-02 2.697318E-03 - --- NaCl 0 4.013143E-32 4.013143E-32 -1.745138E+02 -1.745135E+02 2.996747E-03 3.298479E-03 - --- Cl- 1 2.106688E-01 2.121293E-01 -7.238998E+01 -7.237866E+01 -2.502438E-02 -2.385952E-03 - --- H2 1 1.898463E-07 1.877740E-07 -3.260495E+01 -3.261562E+01 3.274581E-02 5.757729E-03 - --- O2 0 1.242299E-68 1.242299E-68 -1.824432E+02 -1.824429E+02 2.823857E-01 3.203491E-01 - --- Norms of Delta G(): 1.166441E-01 1.309678E-01 + --- NaCl(S) 4.789581E+00 4.787922E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.306971E+01 -2.306931E+01 + --- H2O(L) 1.900833E+00 1.902485E+00 -1.240001E+02 -1.240029E+02 + --- Na+ 2.104191E-01 2.120780E-01 -1.021535E+02 -1.021409E+02 + --- OH- 1.832197E-09 1.858822E-09 -1.088342E+02 -1.088200E+02 + --- OH 3.810548E-07 3.756692E-07 -1.076782E+02 -1.076920E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082245E+02 -5.082241E+02 + --- H+ 1 1.832197E-09 1.858822E-09 -1.519494E+01 -1.516629E+01 -2.906329E-02 1.659943E-02 + --- H2O 1 9.916639E-02 9.751445E-02 -1.239835E+02 -1.239999E+02 1.660229E-02 3.012001E-03 + --- NaCl 0 4.014783E-32 4.014783E-32 -1.745135E+02 -1.745131E+02 3.293917E-03 3.696994E-03 + --- Cl- 1 2.104191E-01 2.120780E-01 -7.239168E+01 -7.237906E+01 -2.843889E-02 -3.186461E-03 + --- H2 1 1.905274E-07 1.878346E-07 -3.260148E+01 -3.261531E+01 4.239981E-02 6.517138E-03 + --- O2 0 1.276361E-68 1.276361E-68 -1.824162E+02 -1.824158E+02 2.961998E-01 3.463166E-01 + --- Norms of Delta G(): 1.234720E-01 1.415898E-01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 2.3267841E+00 - --- air = 4.0974747E+00 - --- NaCl(S) = 4.7878707E+00 + --- NaCl_electrolyte = 2.3266411E+00 + --- air = 4.0975150E+00 + --- NaCl(S) = 4.7879220E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673158693E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2128673452792E+03 - --- Increment counter increased, step is accepted: 37 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673025651E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2128673450210E+03 + --- Increment counter increased, step is accepted: 23 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 37, Iterations since last evaluation of optimal basis = 29 (only major species) + Iteration = 23, Iterations since last evaluation of optimal basis = 21 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- --- NaCl_electrolyte 2 NA 2.327e+00 - --- air 2 NA 4.097e+00 + --- air 2 NA 4.098e+00 --- NaCl(S) 2 NA 4.788e+00 -------------------------------------------------------------- ---------------------------------------------------------------------------------- --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8571E-09 -1.4229E-11 1.5323E-02 | Normal calc: diag adjusted from 1.07693e+09 to 1.07693e+09 due to act coeff - --- H2O 9.7474E-02 -2.6373E-04 2.6973E-03 | Normal calc: diag adjusted from 10.1109 to 10.2275 due to act coeff - --- NaCl 4.0131E-32 0.0000E+00 3.2985E-03 | Skipped: IC = 0 and DG >0: 3.298E-03 - --- Cl- 2.1213E-01 1.3964E-04 -2.3860E-03 | Normal calc: diag adjusted from 7.7091 to 17.0869 due to act coeff - --- H2 1.8777E-07 -3.6038E-10 5.7577E-03 | Normal calc: diag adjusted from 1.59766e+07 to 1.59766e+07 due to act coeff - --- O2 1.2423E-68 0.0000E+00 3.2035E-01 | Skipped: IC = 0 and DG >0: 3.203E-01 + --- H+ 1.8588E-09 -1.5428E-11 1.6599E-02 | Normal calc: diag adjusted from 1.07595e+09 to 1.07595e+09 due to act coeff + --- H2O 9.7514E-02 -2.9462E-04 3.0120E-03 | Normal calc: diag adjusted from 10.1067 to 10.2232 due to act coeff + --- NaCl 4.0148E-32 0.0000E+00 3.6970E-03 | Skipped: IC = 0 and DG >0: 3.697E-03 + --- Cl- 2.1208E-01 1.8647E-04 -3.1865E-03 | Normal calc: diag adjusted from 7.71128 to 17.0885 due to act coeff + --- H2 1.8783E-07 -4.0805E-10 6.5171E-03 | Normal calc: diag adjusted from 1.59715e+07 to 1.59715e+07 due to act coeff + --- O2 1.2764E-68 0.0000E+00 3.4632E-01 | Skipped: IC = 0 and DG >0: 3.463E-01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8571E-09 1.8429E-09-1.4229E-11 | Normal Major Calc - --- H2O 1 9.7474E-02 9.7210E-02-2.6373E-04 | Normal Major Calc - --- NaCl 0 4.0131E-32 4.0131E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.1213E-01 2.1227E-01 1.3964E-04 | Normal Major Calc - --- H2 1 1.8777E-07 1.8741E-07-3.6038E-10 | Normal Major Calc - --- O2 0 1.2423E-68 1.2423E-68 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.7879E+00 4.7877E+00-1.3964E-04 | + --- H+ 1 1.8588E-09 1.8434E-09-1.5428E-11 | Normal Major Calc + --- H2O 1 9.7514E-02 9.7220E-02-2.9462E-04 | Normal Major Calc + --- NaCl 0 4.0148E-32 4.0148E-32 0.0000E+00 | minor species not considered + --- Cl- 1 2.1208E-01 2.1226E-01 1.8647E-04 | Normal Major Calc + --- H2 1 1.8783E-07 1.8743E-07-4.0805E-10 | Normal Major Calc + --- O2 0 1.2764E-68 1.2764E-68 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.7879E+00 4.7877E+00-1.8647E-04 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9025E+00 1.9028E+00 2.6373E-04 | - --- Na+ c 2.1213E-01 2.1227E-01 1.3964E-04 | - --- OH- c 1.8571E-09 1.8429E-09-1.4229E-11 | - --- OH c 3.7555E-07 3.7483E-07-7.2077E-10 | + --- H2O(L) c 1.9025E+00 1.9028E+00 2.9463E-04 | + --- Na+ c 2.1208E-01 2.1226E-01 1.8647E-04 | + --- OH- c 1.8588E-09 1.8434E-09-1.5428E-11 | + --- OH c 3.7567E-07 3.7485E-07-8.1610E-10 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673452792E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458713E+03 - --- subroutine FORCE: Beginning Slope = -1.04454e-06 - --- subroutine FORCE: End Slope = -1.39417e-07 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673450210E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458660E+03 + --- subroutine FORCE: Beginning Slope = -1.48159e-06 + --- subroutine FORCE: End Slope = -2.08102e-07 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.787871E+00 4.787731E+00 -1.745168E+02 -1.745168E+02 - --- N2 4.000000E+00 4.000000E+00 -2.306930E+01 -2.306924E+01 - --- H2O(L) 1.902526E+00 1.902789E+00 -1.240030E+02 -1.240032E+02 - --- Na+ 2.121293E-01 2.122690E-01 -1.021405E+02 -1.021396E+02 - --- OH- 1.857128E-09 1.842900E-09 -1.088209E+02 -1.088287E+02 - --- OH 3.755481E-07 3.748273E-07 -1.076923E+02 -1.076942E+02 + --- NaCl(S) 4.787922E+00 4.787736E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.306931E+01 -2.306924E+01 + --- H2O(L) 1.902485E+00 1.902780E+00 -1.240029E+02 -1.240032E+02 + --- Na+ 2.120780E-01 2.122644E-01 -1.021409E+02 -1.021396E+02 + --- OH- 1.858822E-09 1.843394E-09 -1.088200E+02 -1.088284E+02 + --- OH 3.756692E-07 3.748531E-07 -1.076920E+02 -1.076941E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082241E+02 -5.082240E+02 - --- H+ 1 1.857128E-09 1.842900E-09 -1.516675E+01 -1.517345E+01 1.532344E-02 1.049605E-03 - --- H2O 1 9.747411E-02 9.721038E-02 -1.240003E+02 -1.240029E+02 2.697318E-03 2.623733E-04 - --- NaCl 0 4.013143E-32 4.013143E-32 -1.745135E+02 -1.745134E+02 3.298479E-03 3.362846E-03 - --- Cl- 1 2.121293E-01 2.122690E-01 -7.237866E+01 -7.237772E+01 -2.385952E-03 -5.028783E-04 - --- H2 1 1.877740E-07 1.874137E-07 -3.261562E+01 -3.261748E+01 5.757729E-03 6.075975E-04 - --- O2 0 1.242299E-68 1.242299E-68 -1.824429E+02 -1.824428E+02 3.203491E-01 3.274203E-01 - --- Norms of Delta G(): 1.309678E-01 1.336769E-01 + --- H+ 1 1.858822E-09 1.843394E-09 -1.516629E+01 -1.517321E+01 1.659943E-02 1.552390E-03 + --- H2O 1 9.751445E-02 9.721983E-02 -1.239999E+02 -1.240028E+02 3.012001E-03 3.506627E-04 + --- NaCl 0 4.014783E-32 4.014783E-32 -1.745131E+02 -1.745130E+02 3.696994E-03 3.768900E-03 + --- Cl- 1 2.120780E-01 2.122644E-01 -7.237906E+01 -7.237775E+01 -3.186461E-03 -5.619620E-04 + --- H2 1 1.878346E-07 1.874266E-07 -3.261531E+01 -3.261741E+01 6.517138E-03 7.939681E-04 + --- O2 0 1.276361E-68 1.276361E-68 -1.824158E+02 -1.824158E+02 3.463166E-01 3.542145E-01 + --- Norms of Delta G(): 1.415898E-01 1.446177E-01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 2.3273272E+00 - --- air = 4.0972109E+00 - --- NaCl(S) = 4.7877310E+00 + --- NaCl_electrolyte = 2.3273087E+00 + --- air = 4.0972204E+00 + --- NaCl(S) = 4.7877356E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673452792E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2128673458713E+03 - --- Increment counter increased, step is accepted: 38 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673450210E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2128673458660E+03 + --- Increment counter increased, step is accepted: 24 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 38, Iterations since last evaluation of optimal basis = 30 (only major species) + Iteration = 24, Iterations since last evaluation of optimal basis = 22 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -3203,63 +2200,63 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8429E-09 -9.6716E-13 1.0496E-03 | Normal calc: diag adjusted from 1.08525e+09 to 1.08525e+09 due to act coeff - --- H2O 9.7210E-02 -2.5584E-05 2.6237E-04 | Normal calc: diag adjusted from 10.1388 to 10.2555 due to act coeff - --- NaCl 4.0131E-32 0.0000E+00 3.3628E-03 | Skipped: IC = 0 and DG >0: 3.363E-03 - --- Cl- 2.1227E-01 2.9440E-05 -5.0288E-04 | Normal calc: diag adjusted from 7.7033 to 17.0816 due to act coeff - --- H2 1.8741E-07 -3.7957E-11 6.0760E-04 | Normal calc: diag adjusted from 1.60074e+07 to 1.60074e+07 due to act coeff - --- O2 1.2423E-68 0.0000E+00 3.2742E-01 | Skipped: IC = 0 and DG >0: 3.274E-01 + --- H+ 1.8434E-09 -1.4308E-12 1.5524E-03 | Normal calc: diag adjusted from 1.08496e+09 to 1.08496e+09 due to act coeff + --- H2O 9.7220E-02 -3.4196E-05 3.5066E-04 | Normal calc: diag adjusted from 10.1378 to 10.2545 due to act coeff + --- NaCl 4.0148E-32 0.0000E+00 3.7689E-03 | Skipped: IC = 0 and DG >0: 3.769E-03 + --- Cl- 2.1226E-01 3.2898E-05 -5.6196E-04 | Normal calc: diag adjusted from 7.70349 to 17.0817 due to act coeff + --- H2 1.8743E-07 -4.9604E-11 7.9397E-04 | Normal calc: diag adjusted from 1.60063e+07 to 1.60063e+07 due to act coeff + --- O2 1.2764E-68 0.0000E+00 3.5421E-01 | Skipped: IC = 0 and DG >0: 3.542E-01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8429E-09 1.8419E-09-9.6716E-13 | Normal Major Calc - --- H2O 1 9.7210E-02 9.7185E-02-2.5584E-05 | Normal Major Calc - --- NaCl 0 4.0131E-32 4.0131E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.1227E-01 2.1230E-01 2.9440E-05 | Normal Major Calc - --- H2 1 1.8741E-07 1.8738E-07-3.7957E-11 | Normal Major Calc - --- O2 0 1.2423E-68 1.2423E-68 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.7877E+00 4.7877E+00-2.9440E-05 | + --- H+ 1 1.8434E-09 1.8420E-09-1.4308E-12 | Normal Major Calc + --- H2O 1 9.7220E-02 9.7186E-02-3.4196E-05 | Normal Major Calc + --- NaCl 0 4.0148E-32 4.0148E-32 0.0000E+00 | minor species not considered + --- Cl- 1 2.1226E-01 2.1230E-01 3.2898E-05 | Normal Major Calc + --- H2 1 1.8743E-07 1.8738E-07-4.9604E-11 | Normal Major Calc + --- O2 0 1.2764E-68 1.2764E-68 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.7877E+00 4.7877E+00-3.2898E-05 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9028E+00 1.9028E+00 2.5584E-05 | - --- Na+ c 2.1227E-01 2.1230E-01 2.9440E-05 | - --- OH- c 1.8429E-09 1.8419E-09-9.6716E-13 | - --- OH c 3.7483E-07 3.7475E-07-7.5915E-11 | + --- H2O(L) c 1.9028E+00 1.9028E+00 3.4196E-05 | + --- Na+ c 2.1226E-01 2.1230E-01 3.2898E-05 | + --- OH- c 1.8434E-09 1.8420E-09-1.4308E-12 | + --- OH c 3.7485E-07 3.7475E-07-9.9207E-11 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458713E+03 - --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458835E+03 - --- subroutine FORCE: Beginning Slope = -2.15172e-08 - --- subroutine FORCE: End Slope = -2.87008e-09 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458660E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458834E+03 + --- subroutine FORCE: Beginning Slope = -3.0479e-08 + --- subroutine FORCE: End Slope = -4.2861e-09 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.787731E+00 4.787702E+00 -1.745168E+02 -1.745168E+02 + --- NaCl(S) 4.787736E+00 4.787703E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.306924E+01 -2.306923E+01 - --- H2O(L) 1.902789E+00 1.902815E+00 -1.240032E+02 -1.240032E+02 - --- Na+ 2.122690E-01 2.122984E-01 -1.021396E+02 -1.021393E+02 - --- OH- 1.842900E-09 1.841933E-09 -1.088287E+02 -1.088292E+02 - --- OH 3.748273E-07 3.747514E-07 -1.076942E+02 -1.076943E+02 + --- H2O(L) 1.902780E+00 1.902814E+00 -1.240032E+02 -1.240032E+02 + --- Na+ 2.122644E-01 2.122973E-01 -1.021396E+02 -1.021394E+02 + --- OH- 1.843394E-09 1.841963E-09 -1.088284E+02 -1.088292E+02 + --- OH 3.748531E-07 3.747539E-07 -1.076941E+02 -1.076943E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082240E+02 -5.082240E+02 - --- H+ 1 1.842900E-09 1.841933E-09 -1.517345E+01 -1.517372E+01 1.049605E-03 3.070894E-04 - --- H2O 1 9.721038E-02 9.718480E-02 -1.240029E+02 -1.240032E+02 2.623733E-04 5.606628E-05 - --- NaCl 0 4.013143E-32 4.013143E-32 -1.745134E+02 -1.745134E+02 3.362846E-03 3.369090E-03 - --- Cl- 1 2.122690E-01 2.122984E-01 -7.237772E+01 -7.237749E+01 -5.028783E-04 -4.876714E-05 - --- H2 1 1.874137E-07 1.873757E-07 -3.261748E+01 -3.261767E+01 6.075975E-04 1.199957E-04 - --- O2 0 1.242299E-68 1.242299E-68 -1.824428E+02 -1.824428E+02 3.274203E-01 3.281105E-01 - --- Norms of Delta G(): 1.336769E-01 1.339577E-01 + --- H+ 1 1.843394E-09 1.841963E-09 -1.517321E+01 -1.517371E+01 1.552390E-03 3.291143E-04 + --- H2O 1 9.721983E-02 9.718563E-02 -1.240028E+02 -1.240032E+02 3.506627E-04 6.262934E-05 + --- NaCl 0 4.014783E-32 4.014783E-32 -1.745130E+02 -1.745130E+02 3.768900E-03 3.777246E-03 + --- Cl- 1 2.122644E-01 2.122973E-01 -7.237775E+01 -7.237750E+01 -5.619620E-04 -6.518287E-05 + --- H2 1 1.874266E-07 1.873770E-07 -3.261741E+01 -3.261767E+01 7.939681E-04 1.357775E-04 + --- O2 0 1.276361E-68 1.276361E-68 -1.824158E+02 -1.824157E+02 3.542145E-01 3.551374E-01 + --- Norms of Delta G(): 1.446177E-01 1.449925E-01 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 2.3274116E+00 - --- air = 4.0971854E+00 - --- NaCl(S) = 4.7877016E+00 + --- NaCl_electrolyte = 2.3274087E+00 + --- air = 4.0971862E+00 + --- NaCl(S) = 4.7877027E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458713E+03 - --- Total New Dimensionless Gibbs Free Energy = -1.2128673458835E+03 - --- Increment counter increased, step is accepted: 39 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458660E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2128673458834E+03 + --- Increment counter increased, step is accepted: 25 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed @@ -3267,7 +2264,7 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for minor noncomponents ============================================================================================================== - Iteration = 39, Iterations since last evaluation of optimal basis = 31 (all species) + Iteration = 25, Iterations since last evaluation of optimal basis = 23 (all species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -3279,70 +2276,70 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8419E-09 -2.8282E-13 3.0709E-04 | Normal calc: diag adjusted from 1.08582e+09 to 1.08582e+09 due to act coeff - --- H2O 9.7185E-02 -5.4655E-06 5.6066E-05 | Normal calc: diag adjusted from 10.1415 to 10.2582 due to act coeff - --- NaCl 4.0131E-32 0.0000E+00 3.3691E-03 | Skipped: IC = 0 and DG >0: 3.369E-03 - --- Cl- 2.1230E-01 2.8551E-06 -4.8767E-05 | Normal calc: diag adjusted from 7.70206 to 17.0806 due to act coeff - --- H2 1.8738E-07 -7.4948E-12 1.2000E-04 | Normal calc: diag adjusted from 1.60106e+07 to 1.60106e+07 due to act coeff - --- O2 1.2423E-68 0.0000E+00 3.2811E-01 | Skipped: IC = 0 and DG >0: 3.281E-01 + --- H+ 1.8420E-09 -3.0311E-13 3.2911E-04 | Normal calc: diag adjusted from 1.0858e+09 to 1.0858e+09 due to act coeff + --- H2O 9.7186E-02 -6.1053E-06 6.2629E-05 | Normal calc: diag adjusted from 10.1414 to 10.2581 due to act coeff + --- NaCl 4.0148E-32 0.0000E+00 3.7772E-03 | Skipped: IC = 0 and DG >0: 3.777E-03 + --- Cl- 2.1230E-01 3.8162E-06 -6.5183E-05 | Normal calc: diag adjusted from 7.7021 to 17.0807 due to act coeff + --- H2 1.8738E-07 -8.4805E-12 1.3578E-04 | Normal calc: diag adjusted from 1.60105e+07 to 1.60105e+07 due to act coeff + --- O2 1.2764E-68 0.0000E+00 3.5514E-01 | Skipped: IC = 0 and DG >0: 3.551E-01 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Full Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8419E-09 1.8416E-09-2.8282E-13 | Normal Major Calc - --- H2O 1 9.7185E-02 9.7179E-02-5.4655E-06 | Normal Major Calc - --- NaCl 0 4.0131E-32 3.9996E-32-1.3498E-34 | minor species alternative calc - --- Cl- 1 2.1230E-01 2.1230E-01 2.8551E-06 | Normal Major Calc - --- H2 1 1.8738E-07 1.8737E-07-7.4948E-12 | Normal Major Calc - --- O2 0 1.2423E-68 8.9481E-69-3.4749E-69 | minor species alternative calc - --- NaCl(S) c 4.7877E+00 4.7877E+00-2.8551E-06 | + --- H+ 1 1.8420E-09 1.8417E-09-3.0311E-13 | Normal Major Calc + --- H2O 1 9.7186E-02 9.7180E-02-6.1053E-06 | Normal Major Calc + --- NaCl 0 4.0148E-32 3.9996E-32-1.5136E-34 | minor species alternative calc + --- Cl- 1 2.1230E-01 2.1230E-01 3.8162E-06 | Normal Major Calc + --- H2 1 1.8738E-07 1.8737E-07-8.4805E-12 | Normal Major Calc + --- O2 0 1.2764E-68 8.9483E-69-3.8153E-69 | minor species alternative calc + --- NaCl(S) c 4.7877E+00 4.7877E+00-3.8162E-06 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9028E+00 1.9028E+00 5.4655E-06 | - --- Na+ c 2.1230E-01 2.1230E-01 2.8551E-06 | - --- OH- c 1.8419E-09 1.8416E-09-2.8282E-13 | - --- OH c 3.7475E-07 3.7474E-07-1.4990E-11 | + --- H2O(L) c 1.9028E+00 1.9028E+00 6.1054E-06 | + --- Na+ c 2.1230E-01 2.1230E-01 3.8162E-06 | + --- OH- c 1.8420E-09 1.8417E-09-3.0311E-13 | + --- OH c 3.7475E-07 3.7474E-07-1.6961E-11 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop --- Subroutine vcs_dfe called for all species using tentative solution --- Subroutine vcs_deltag called for all noncomponents - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458835E+03 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458834E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- subroutine FORCE: Beginning Slope = -4.45667e-10 - --- subroutine FORCE: End Slope = -5.94674e-11 + --- subroutine FORCE: Beginning Slope = -6.31124e-10 + --- subroutine FORCE: End Slope = -8.87911e-11 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (all species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT - --- NaCl(S) 4.787702E+00 4.787699E+00 -1.745168E+02 -1.745168E+02 + --- NaCl(S) 4.787703E+00 4.787699E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.306923E+01 -2.306923E+01 - --- H2O(L) 1.902815E+00 1.902820E+00 -1.240032E+02 -1.240033E+02 - --- Na+ 2.122984E-01 2.123012E-01 -1.021393E+02 -1.021393E+02 - --- OH- 1.841933E-09 1.841650E-09 -1.088292E+02 -1.088294E+02 - --- OH 3.747514E-07 3.747364E-07 -1.076943E+02 -1.076944E+02 + --- H2O(L) 1.902814E+00 1.902820E+00 -1.240032E+02 -1.240032E+02 + --- Na+ 2.122973E-01 2.123012E-01 -1.021394E+02 -1.021393E+02 + --- OH- 1.841963E-09 1.841660E-09 -1.088292E+02 -1.088294E+02 + --- OH 3.747539E-07 3.747369E-07 -1.076943E+02 -1.076944E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082240E+02 -5.082240E+02 - --- H+ 1 1.841933E-09 1.841650E-09 -1.517372E+01 -1.517385E+01 3.070894E-04 2.246188E-05 - --- H2O 1 9.718480E-02 9.717933E-02 -1.240032E+02 -1.240032E+02 5.606628E-05 5.439408E-06 - --- NaCl 0 4.013143E-32 3.999645E-32 -1.745134E+02 -1.745168E+02 3.369090E-03 1.333970E-06 - --- Cl- 1 2.122984E-01 2.123012E-01 -7.237749E+01 -7.237747E+01 -4.876714E-05 -1.041579E-05 - --- H2 1 1.873757E-07 1.873682E-07 -3.261767E+01 -3.261771E+01 1.199957E-04 1.255732E-05 - --- O2 0 1.242299E-68 8.948073E-69 -1.824428E+02 -1.827709E+02 3.281105E-01 1.474378E-04 - --- Norms of Delta G(): 1.339577E-01 6.129163E-05 + --- H+ 1 1.841963E-09 1.841660E-09 -1.517371E+01 -1.517384E+01 3.291143E-04 3.297167E-05 + --- H2O 1 9.718563E-02 9.717953E-02 -1.240032E+02 -1.240032E+02 6.262934E-05 7.270506E-06 + --- NaCl 0 4.014783E-32 3.999646E-32 -1.745130E+02 -1.745168E+02 3.777246E-03 1.490136E-06 + --- Cl- 1 2.122973E-01 2.123012E-01 -7.237750E+01 -7.237747E+01 -6.518287E-05 -1.163523E-05 + --- H2 1 1.873770E-07 1.873685E-07 -3.261767E+01 -3.261771E+01 1.357775E-04 1.641605E-05 + --- O2 0 1.276361E-68 8.948274E-69 -1.824157E+02 -1.827709E+02 3.551374E-01 1.646216E-04 + --- Norms of Delta G(): 1.449925E-01 6.909817E-05 --- Phase_Name KMoles(after update) --- -------------------------------------------------- - --- NaCl_electrolyte = 2.3274228E+00 - --- air = 4.0971799E+00 + --- NaCl_electrolyte = 2.3274224E+00 + --- air = 4.0971801E+00 --- NaCl(S) = 4.7876988E+00 ------------------------------------------------------------------------------------------------------- - --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458835E+03 + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458834E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- Increment counter increased, step is accepted: 40 + --- Increment counter increased, step is accepted: 26 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Reevaluate major-minor status of noncomponents: --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 40, Iterations since last evaluation of optimal basis = 32 (only major species) + Iteration = 26, Iterations since last evaluation of optimal basis = 24 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -3354,27 +2351,27 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8416E-09 -2.0683E-14 2.2462E-05 | Normal calc: diag adjusted from 1.08598e+09 to 1.08598e+09 due to act coeff - --- H2O 9.7179E-02 -5.3022E-07 5.4394E-06 | Normal calc: diag adjusted from 10.1421 to 10.2588 due to act coeff - --- NaCl 3.9996E-32 0.0000E+00 1.3340E-06 | Skipped: IC = 0 and DG >0: 1.334E-06 - --- Cl- 2.1230E-01 6.0981E-07 -1.0416E-05 | Normal calc: diag adjusted from 7.70194 to 17.0805 due to act coeff - --- H2 1.8737E-07 -7.8428E-13 1.2557E-05 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff - --- O2 8.9481E-69 0.0000E+00 1.4744E-04 | Skipped: IC = 0 and DG >0: 1.474E-04 + --- H+ 1.8417E-09 -3.0361E-14 3.2972E-05 | Normal calc: diag adjusted from 1.08598e+09 to 1.08598e+09 due to act coeff + --- H2O 9.7180E-02 -7.0871E-07 7.2705E-06 | Normal calc: diag adjusted from 10.142 to 10.2588 due to act coeff + --- NaCl 3.9996E-32 0.0000E+00 1.4901E-06 | Skipped: IC = 0 and DG >0: 1.490E-06 + --- Cl- 2.1230E-01 6.8120E-07 -1.1635E-05 | Normal calc: diag adjusted from 7.70194 to 17.0805 due to act coeff + --- H2 1.8737E-07 -1.0253E-12 1.6416E-05 | Normal calc: diag adjusted from 1.60112e+07 to 1.60112e+07 due to act coeff + --- O2 8.9483E-69 0.0000E+00 1.6462E-04 | Skipped: IC = 0 and DG >0: 1.646E-04 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8416E-09 1.8416E-09-2.0683E-14 | Normal Major Calc - --- H2O 1 9.7179E-02 9.7179E-02-5.3022E-07 | Normal Major Calc + --- H+ 1 1.8417E-09 1.8416E-09-3.0361E-14 | Normal Major Calc + --- H2O 1 9.7180E-02 9.7179E-02-7.0871E-07 | Normal Major Calc --- NaCl 0 3.9996E-32 3.9996E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.1230E-01 2.1230E-01 6.0981E-07 | Normal Major Calc - --- H2 1 1.8737E-07 1.8737E-07-7.8428E-13 | Normal Major Calc - --- O2 0 8.9481E-69 8.9481E-69 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.7877E+00 4.7877E+00-6.0981E-07 | + --- Cl- 1 2.1230E-01 2.1230E-01 6.8120E-07 | Normal Major Calc + --- H2 1 1.8737E-07 1.8737E-07-1.0253E-12 | Normal Major Calc + --- O2 0 8.9483E-69 8.9483E-69 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.7877E+00 4.7877E+00-6.8120E-07 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9028E+00 1.9028E+00 5.3022E-07 | - --- Na+ c 2.1230E-01 2.1230E-01 6.0981E-07 | - --- OH- c 1.8416E-09 1.8416E-09-2.0683E-14 | - --- OH c 3.7474E-07 3.7473E-07-1.5686E-12 | + --- H2O(L) c 1.9028E+00 1.9028E+00 7.0871E-07 | + --- Na+ c 2.1230E-01 2.1230E-01 6.8120E-07 | + --- OH- c 1.8417E-09 1.8416E-09-3.0361E-14 | + --- OH c 3.7474E-07 3.7473E-07-2.0506E-12 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -3382,41 +2379,41 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- subroutine FORCE: Beginning Slope = -9.23569e-12 - --- subroutine FORCE: End Slope = -1.23234e-12 + --- subroutine FORCE: Beginning Slope = -1.30786e-11 + --- subroutine FORCE: End Slope = -1.84004e-12 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT --- NaCl(S) 4.787699E+00 4.787698E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.306923E+01 -2.306923E+01 - --- H2O(L) 1.902820E+00 1.902821E+00 -1.240033E+02 -1.240033E+02 - --- Na+ 2.123012E-01 2.123019E-01 -1.021393E+02 -1.021393E+02 - --- OH- 1.841650E-09 1.841629E-09 -1.088294E+02 -1.088294E+02 - --- OH 3.747364E-07 3.747348E-07 -1.076944E+02 -1.076944E+02 + --- H2O(L) 1.902820E+00 1.902821E+00 -1.240032E+02 -1.240033E+02 + --- Na+ 2.123012E-01 2.123018E-01 -1.021393E+02 -1.021393E+02 + --- OH- 1.841660E-09 1.841630E-09 -1.088294E+02 -1.088294E+02 + --- OH 3.747369E-07 3.747349E-07 -1.076944E+02 -1.076944E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082240E+02 -5.082240E+02 - --- H+ 1 1.841650E-09 1.841629E-09 -1.517385E+01 -1.517386E+01 2.246188E-05 6.365793E-06 - --- H2O 1 9.717933E-02 9.717880E-02 -1.240032E+02 -1.240033E+02 5.439408E-06 1.162096E-06 - --- NaCl 0 3.999645E-32 3.999645E-32 -1.745168E+02 -1.745168E+02 1.333970E-06 1.463381E-06 - --- Cl- 1 2.123012E-01 2.123019E-01 -7.237747E+01 -7.237747E+01 -1.041579E-05 -1.010450E-06 - --- H2 1 1.873682E-07 1.873674E-07 -3.261771E+01 -3.261772E+01 1.255732E-05 2.486952E-06 - --- O2 0 8.948073E-69 8.948073E-69 -1.827709E+02 -1.827709E+02 1.474378E-04 1.616940E-04 - --- Norms of Delta G(): 6.129163E-05 6.607591E-05 + --- H+ 1 1.841660E-09 1.841630E-09 -1.517384E+01 -1.517385E+01 3.297167E-05 6.825273E-06 + --- H2O 1 9.717953E-02 9.717882E-02 -1.240032E+02 -1.240032E+02 7.270506E-06 1.298138E-06 + --- NaCl 0 3.999646E-32 3.999646E-32 -1.745168E+02 -1.745168E+02 1.490136E-06 1.663112E-06 + --- Cl- 1 2.123012E-01 2.123018E-01 -7.237747E+01 -7.237747E+01 -1.163523E-05 -1.350606E-06 + --- H2 1 1.873685E-07 1.873674E-07 -3.261771E+01 -3.261772E+01 1.641605E-05 2.813834E-06 + --- O2 0 8.948274E-69 8.948274E-69 -1.827709E+02 -1.827709E+02 1.646216E-04 1.836958E-04 + --- Norms of Delta G(): 6.909817E-05 7.506102E-05 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 2.3274245E+00 --- air = 4.0971794E+00 - --- NaCl(S) = 4.7876981E+00 + --- NaCl(S) = 4.7876982E+00 ------------------------------------------------------------------------------------------------------- --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- Increment counter increased, step is accepted: 41 + --- Increment counter increased, step is accepted: 27 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 41, Iterations since last evaluation of optimal basis = 33 (only major species) + Iteration = 27, Iterations since last evaluation of optimal basis = 25 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -3428,27 +2425,27 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8416E-09 -5.8617E-15 6.3658E-06 | Normal calc: diag adjusted from 1.086e+09 to 1.086e+09 due to act coeff - --- H2O 9.7179E-02 -1.1328E-07 1.1621E-06 | Normal calc: diag adjusted from 10.1421 to 10.2589 due to act coeff - --- NaCl 3.9996E-32 0.0000E+00 1.4634E-06 | Skipped: IC = 0 and DG >0: 1.463E-06 - --- Cl- 2.1230E-01 5.9158E-08 -1.0105E-06 | Normal calc: diag adjusted from 7.70191 to 17.0805 due to act coeff - --- H2 1.8737E-07 -1.5532E-13 2.4870E-06 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff - --- O2 8.9481E-69 0.0000E+00 1.6169E-04 | Skipped: IC = 0 and DG >0: 1.617E-04 + --- H+ 1.8416E-09 -6.2848E-15 6.8253E-06 | Normal calc: diag adjusted from 1.08599e+09 to 1.08599e+09 due to act coeff + --- H2O 9.7179E-02 -1.2654E-07 1.2981E-06 | Normal calc: diag adjusted from 10.1421 to 10.2589 due to act coeff + --- NaCl 3.9996E-32 0.0000E+00 1.6631E-06 | Skipped: IC = 0 and DG >0: 1.663E-06 + --- Cl- 2.1230E-01 7.9073E-08 -1.3506E-06 | Normal calc: diag adjusted from 7.70191 to 17.0805 due to act coeff + --- H2 1.8737E-07 -1.7574E-13 2.8138E-06 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff + --- O2 8.9483E-69 0.0000E+00 1.8370E-04 | Skipped: IC = 0 and DG >0: 1.837E-04 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8416E-09 1.8416E-09-5.8617E-15 | Normal Major Calc - --- H2O 1 9.7179E-02 9.7179E-02-1.1328E-07 | Normal Major Calc + --- H+ 1 1.8416E-09 1.8416E-09-6.2848E-15 | Normal Major Calc + --- H2O 1 9.7179E-02 9.7179E-02-1.2654E-07 | Normal Major Calc --- NaCl 0 3.9996E-32 3.9996E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.1230E-01 2.1230E-01 5.9158E-08 | Normal Major Calc - --- H2 1 1.8737E-07 1.8737E-07-1.5532E-13 | Normal Major Calc - --- O2 0 8.9481E-69 8.9481E-69 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.7877E+00 4.7877E+00-5.9158E-08 | + --- Cl- 1 2.1230E-01 2.1230E-01 7.9073E-08 | Normal Major Calc + --- H2 1 1.8737E-07 1.8737E-07-1.7574E-13 | Normal Major Calc + --- O2 0 8.9483E-69 8.9483E-69 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.7877E+00 4.7877E+00-7.9073E-08 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9028E+00 1.9028E+00 1.1328E-07 | - --- Na+ c 2.1230E-01 2.1230E-01 5.9158E-08 | - --- OH- c 1.8416E-09 1.8416E-09-5.8617E-15 | - --- OH c 3.7473E-07 3.7473E-07-3.1065E-13 | + --- H2O(L) c 1.9028E+00 1.9028E+00 1.2654E-07 | + --- Na+ c 2.1230E-01 2.1230E-01 7.9073E-08 | + --- OH- c 1.8416E-09 1.8416E-09-6.2848E-15 | + --- OH c 3.7473E-07 3.7473E-07-3.5148E-13 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -3456,8 +2453,8 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- subroutine FORCE: Beginning Slope = -1.91416e-13 - --- subroutine FORCE: End Slope = -2.55413e-14 + --- subroutine FORCE: Beginning Slope = -2.71061e-13 + --- subroutine FORCE: End Slope = -3.81361e-14 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): @@ -3465,17 +2462,17 @@ VCS CALCULATION METHOD --- NaCl(S) 4.787698E+00 4.787698E+00 -1.745168E+02 -1.745168E+02 --- N2 4.000000E+00 4.000000E+00 -2.306923E+01 -2.306923E+01 --- H2O(L) 1.902821E+00 1.902821E+00 -1.240033E+02 -1.240033E+02 - --- Na+ 2.123019E-01 2.123019E-01 -1.021393E+02 -1.021393E+02 - --- OH- 1.841629E-09 1.841623E-09 -1.088294E+02 -1.088294E+02 - --- OH 3.747348E-07 3.747345E-07 -1.076944E+02 -1.076944E+02 + --- Na+ 2.123018E-01 2.123019E-01 -1.021393E+02 -1.021393E+02 + --- OH- 1.841630E-09 1.841623E-09 -1.088294E+02 -1.088294E+02 + --- OH 3.747349E-07 3.747345E-07 -1.076944E+02 -1.076944E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082240E+02 -5.082240E+02 - --- H+ 1 1.841629E-09 1.841623E-09 -1.517386E+01 -1.517386E+01 6.365793E-06 4.658105E-07 - --- H2O 1 9.717880E-02 9.717869E-02 -1.240033E+02 -1.240033E+02 1.162096E-06 1.127375E-07 - --- NaCl 0 3.999645E-32 3.999645E-32 -1.745168E+02 -1.745168E+02 1.463381E-06 1.491029E-06 - --- Cl- 1 2.123019E-01 2.123019E-01 -7.237747E+01 -7.237746E+01 -1.010450E-06 -2.158741E-07 - --- H2 1 1.873674E-07 1.873673E-07 -3.261772E+01 -3.261772E+01 2.486952E-06 2.602471E-07 - --- O2 0 8.948073E-69 8.948073E-69 -1.827709E+02 -1.827709E+02 1.616940E-04 1.647496E-04 - --- Norms of Delta G(): 6.607591E-05 6.726194E-05 + --- H+ 1 1.841630E-09 1.841623E-09 -1.517385E+01 -1.517386E+01 6.825273E-06 6.836550E-07 + --- H2O 1 9.717882E-02 9.717869E-02 -1.240032E+02 -1.240033E+02 1.298138E-06 1.506892E-07 + --- NaCl 0 3.999646E-32 3.999646E-32 -1.745168E+02 -1.745168E+02 1.663112E-06 1.693996E-06 + --- Cl- 1 2.123018E-01 2.123019E-01 -7.237747E+01 -7.237746E+01 -1.350606E-06 -2.411459E-07 + --- H2 1 1.873674E-07 1.873673E-07 -3.261772E+01 -3.261772E+01 2.813834E-06 3.402212E-07 + --- O2 0 8.948274E-69 8.948274E-69 -1.827709E+02 -1.827709E+02 1.836958E-04 1.871074E-04 + --- Norms of Delta G(): 7.506102E-05 7.639013E-05 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 2.3274248E+00 @@ -3484,13 +2481,13 @@ VCS CALCULATION METHOD ------------------------------------------------------------------------------------------------------- --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- Increment counter increased, step is accepted: 42 + --- Increment counter increased, step is accepted: 28 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed ============================================================================================================== - Iteration = 42, Iterations since last evaluation of optimal basis = 34 (only major species) + Iteration = 28, Iterations since last evaluation of optimal basis = 26 (only major species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -3502,27 +2499,27 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8416E-09 -4.2892E-16 4.6581E-07 | Normal calc: diag adjusted from 1.086e+09 to 1.086e+09 due to act coeff - --- H2O 9.7179E-02 -1.0989E-08 1.1274E-07 | Normal calc: diag adjusted from 10.1421 to 10.2589 due to act coeff - --- NaCl 3.9996E-32 0.0000E+00 1.4910E-06 | Skipped: IC = 0 and DG >0: 1.491E-06 - --- Cl- 2.1230E-01 1.2639E-08 -2.1587E-07 | Normal calc: diag adjusted from 7.70191 to 17.0805 due to act coeff - --- H2 1.8737E-07 -1.6254E-14 2.6025E-07 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff - --- O2 8.9481E-69 0.0000E+00 1.6475E-04 | Skipped: IC = 0 and DG >0: 1.647E-04 + --- H+ 1.8416E-09 -6.2952E-16 6.8366E-07 | Normal calc: diag adjusted from 1.086e+09 to 1.086e+09 due to act coeff + --- H2O 9.7179E-02 -1.4689E-08 1.5069E-07 | Normal calc: diag adjusted from 10.1421 to 10.2589 due to act coeff + --- NaCl 3.9996E-32 0.0000E+00 1.6940E-06 | Skipped: IC = 0 and DG >0: 1.694E-06 + --- Cl- 2.1230E-01 1.4118E-08 -2.4115E-07 | Normal calc: diag adjusted from 7.70191 to 17.0805 due to act coeff + --- H2 1.8737E-07 -2.1249E-14 3.4022E-07 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff + --- O2 8.9483E-69 0.0000E+00 1.8711E-04 | Skipped: IC = 0 and DG >0: 1.871E-04 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Major Components Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8416E-09 1.8416E-09-4.2892E-16 | Normal Major Calc - --- H2O 1 9.7179E-02 9.7179E-02-1.0989E-08 | Normal Major Calc + --- H+ 1 1.8416E-09 1.8416E-09-6.2952E-16 | Normal Major Calc + --- H2O 1 9.7179E-02 9.7179E-02-1.4689E-08 | Normal Major Calc --- NaCl 0 3.9996E-32 3.9996E-32 0.0000E+00 | minor species not considered - --- Cl- 1 2.1230E-01 2.1230E-01 1.2639E-08 | Normal Major Calc - --- H2 1 1.8737E-07 1.8737E-07-1.6254E-14 | Normal Major Calc - --- O2 0 8.9481E-69 8.9481E-69 0.0000E+00 | minor species not considered - --- NaCl(S) c 4.7877E+00 4.7877E+00-1.2639E-08 | + --- Cl- 1 2.1230E-01 2.1230E-01 1.4118E-08 | Normal Major Calc + --- H2 1 1.8737E-07 1.8737E-07-2.1249E-14 | Normal Major Calc + --- O2 0 8.9483E-69 8.9483E-69 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.7877E+00 4.7877E+00-1.4118E-08 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9028E+00 1.9028E+00 1.0989E-08 | - --- Na+ c 2.1230E-01 2.1230E-01 1.2639E-08 | - --- OH- c 1.8416E-09 1.8416E-09-4.2892E-16 | - --- OH c 3.7473E-07 3.7473E-07-3.2508E-14 | + --- H2O(L) c 1.9028E+00 1.9028E+00 1.4689E-08 | + --- Na+ c 2.1230E-01 2.1230E-01 1.4118E-08 | + --- OH- c 1.8416E-09 1.8416E-09-6.2952E-16 | + --- OH c 3.7473E-07 3.7473E-07-4.2498E-14 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -3530,8 +2527,8 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- subroutine FORCE: Beginning Slope = -3.96726e-15 - --- subroutine FORCE: End Slope = -5.29367e-16 + --- subroutine FORCE: Beginning Slope = -5.61798e-15 + --- subroutine FORCE: End Slope = -7.90405e-16 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (only major species): @@ -3543,13 +2540,13 @@ VCS CALCULATION METHOD --- OH- 1.841623E-09 1.841623E-09 -1.088294E+02 -1.088294E+02 --- OH 3.747345E-07 3.747345E-07 -1.076944E+02 -1.076944E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082240E+02 -5.082240E+02 - --- H+ 1 1.841623E-09 1.841623E-09 -1.517386E+01 -1.517386E+01 4.658105E-07 1.319376E-07 - --- H2O 1 9.717869E-02 9.717868E-02 -1.240033E+02 -1.240033E+02 1.127375E-07 2.408557E-08 - --- NaCl 0 3.999645E-32 3.999645E-32 -1.745168E+02 -1.745168E+02 1.491029E-06 1.493711E-06 - --- Cl- 1 2.123019E-01 2.123019E-01 -7.237746E+01 -7.237746E+01 -2.158741E-07 -2.094241E-08 - --- H2 1 1.873673E-07 1.873673E-07 -3.261772E+01 -3.261772E+01 2.602471E-07 5.154439E-08 - --- O2 0 8.948073E-69 8.948073E-69 -1.827709E+02 -1.827709E+02 1.647496E-04 1.650451E-04 - --- Norms of Delta G(): 6.726194E-05 6.738217E-05 + --- H+ 1 1.841623E-09 1.841623E-09 -1.517386E+01 -1.517386E+01 6.836550E-07 1.414622E-07 + --- H2O 1 9.717869E-02 9.717868E-02 -1.240033E+02 -1.240033E+02 1.506892E-07 2.690517E-08 + --- NaCl 0 3.999646E-32 3.999646E-32 -1.745168E+02 -1.745168E+02 1.693996E-06 1.697581E-06 + --- Cl- 1 2.123019E-01 2.123019E-01 -7.237746E+01 -7.237746E+01 -2.411459E-07 -2.799241E-08 + --- H2 1 1.873673E-07 1.873673E-07 -3.261772E+01 -3.261772E+01 3.402212E-07 5.831922E-08 + --- O2 0 8.948274E-69 8.948274E-69 -1.827709E+02 -1.827709E+02 1.871074E-04 1.875027E-04 + --- Norms of Delta G(): 7.639013E-05 7.655082E-05 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 2.3274248E+00 @@ -3558,7 +2555,7 @@ VCS CALCULATION METHOD ------------------------------------------------------------------------------------------------------- --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- Increment counter increased, step is accepted: 43 + --- Increment counter increased, step is accepted: 29 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Equilibrium check for major species: H+ failed @@ -3566,7 +2563,7 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for minor noncomponents ============================================================================================================== - Iteration = 43, Iterations since last evaluation of optimal basis = 35 (all species) + Iteration = 29, Iterations since last evaluation of optimal basis = 27 (all species) --- vcs_popPhaseID() called --- Phase Status F_e MoleNum -------------------------------------------------------------- @@ -3578,27 +2575,27 @@ VCS CALCULATION METHOD --- Subroutine vcs_RxnStepSizes called - Details: ---------------------------------------------------------------------------------- --- Species KMoles Rxn_Adjustment DeltaG | Comment - --- H+ 1.8416E-09 -1.2149E-16 1.3194E-07 | Normal calc: diag adjusted from 1.086e+09 to 1.086e+09 due to act coeff - --- H2O 9.7179E-02 -2.3478E-09 2.4086E-08 | Normal calc: diag adjusted from 10.1421 to 10.2589 due to act coeff - --- NaCl 3.9996E-32 0.0000E+00 1.4937E-06 | Skipped: IC = 0 and DG >0: 1.494E-06 - --- Cl- 2.1230E-01 1.2261E-09 -2.0942E-08 | Normal calc: diag adjusted from 7.70191 to 17.0805 due to act coeff - --- H2 1.8737E-07 -3.2192E-15 5.1544E-08 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff - --- O2 8.9481E-69 0.0000E+00 1.6505E-04 | Skipped: IC = 0 and DG >0: 1.650E-04 + --- H+ 1.8416E-09 -1.3026E-16 1.4146E-07 | Normal calc: diag adjusted from 1.086e+09 to 1.086e+09 due to act coeff + --- H2O 9.7179E-02 -2.6226E-09 2.6905E-08 | Normal calc: diag adjusted from 10.1421 to 10.2589 due to act coeff + --- NaCl 3.9996E-32 0.0000E+00 1.6976E-06 | Skipped: IC = 0 and DG >0: 1.698E-06 + --- Cl- 2.1230E-01 1.6389E-09 -2.7992E-08 | Normal calc: diag adjusted from 7.70191 to 17.0805 due to act coeff + --- H2 1.8737E-07 -3.6424E-15 5.8319E-08 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff + --- O2 8.9483E-69 0.0000E+00 1.8750E-04 | Skipped: IC = 0 and DG >0: 1.875E-04 ---------------------------------------------------------------------------------- --- Main Loop Treatment of each non-component species - Full Calculation: --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment - --- H+ 1 1.8416E-09 1.8416E-09-1.2149E-16 | Normal Major Calc - --- H2O 1 9.7179E-02 9.7179E-02-2.3478E-09 | Normal Major Calc - --- NaCl 0 3.9996E-32 3.9996E-32-5.9743E-38 | minor species alternative calc - --- Cl- 1 2.1230E-01 2.1230E-01 1.2261E-09 | Normal Major Calc - --- H2 1 1.8737E-07 1.8737E-07-3.2192E-15 | Normal Major Calc - --- O2 0 8.9481E-69 8.9466E-69-1.4767E-72 | minor species alternative calc - --- NaCl(S) c 4.7877E+00 4.7877E+00-1.2261E-09 | + --- H+ 1 1.8416E-09 1.8416E-09-1.3026E-16 | Normal Major Calc + --- H2O 1 9.7179E-02 9.7179E-02-2.6226E-09 | Normal Major Calc + --- NaCl 0 3.9996E-32 3.9996E-32-6.7897E-38 | minor species alternative calc + --- Cl- 1 2.1230E-01 2.1230E-01 1.6389E-09 | Normal Major Calc + --- H2 1 1.8737E-07 1.8737E-07-3.6424E-15 | Normal Major Calc + --- O2 0 8.9483E-69 8.9466E-69-1.6777E-72 | minor species alternative calc + --- NaCl(S) c 4.7877E+00 4.7877E+00-1.6389E-09 | --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | - --- H2O(L) c 1.9028E+00 1.9028E+00 2.3478E-09 | - --- Na+ c 2.1230E-01 2.1230E-01 1.2261E-09 | - --- OH- c 1.8416E-09 1.8416E-09-1.2149E-16 | - --- OH c 3.7473E-07 3.7473E-07-6.4385E-15 | + --- H2O(L) c 1.9028E+00 1.9028E+00 2.6226E-09 | + --- Na+ c 2.1230E-01 2.1230E-01 1.6389E-09 | + --- OH- c 1.8416E-09 1.8416E-09-1.3026E-16 | + --- OH c 3.7473E-07 3.7473E-07-7.2847E-15 | --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | -------------------------------------------------------------------------------- --- Finished Main Loop @@ -3606,8 +2603,8 @@ VCS CALCULATION METHOD --- Subroutine vcs_deltag called for all noncomponents --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- subroutine FORCE: Beginning Slope = -8.22252e-17 - --- subroutine FORCE: End Slope = -1.09716e-17 + --- subroutine FORCE: Beginning Slope = -1.16438e-16 + --- subroutine FORCE: End Slope = -1.63819e-17 --- subroutine FORCE produced no adjustments, s2 < 0 ------------------------------------------------------------------------------------------------------- --- Summary of the Update (all species): @@ -3619,13 +2616,13 @@ VCS CALCULATION METHOD --- OH- 1.841623E-09 1.841623E-09 -1.088294E+02 -1.088294E+02 --- OH 3.747345E-07 3.747345E-07 -1.076944E+02 -1.076944E+02 --- CO2 0.000000E+00 0.000000E+00 -5.082240E+02 -5.082240E+02 - --- H+ 1 1.841623E-09 1.841623E-09 -1.517386E+01 -1.517386E+01 1.319376E-07 9.654457E-09 - --- H2O 1 9.717868E-02 9.717867E-02 -1.240033E+02 -1.240033E+02 2.408557E-08 2.336577E-09 - --- NaCl 0 3.999645E-32 3.999640E-32 -1.745168E+02 -1.745168E+02 1.493711E-06 5.730385E-10 - --- Cl- 1 2.123019E-01 2.123019E-01 -7.237746E+01 -7.237746E+01 -2.094241E-08 -4.474217E-09 - --- H2 1 1.873673E-07 1.873672E-07 -3.261772E+01 -3.261772E+01 5.154439E-08 5.393844E-09 - --- O2 0 8.948073E-69 8.946597E-69 -1.827709E+02 -1.827711E+02 1.650451E-04 6.333210E-08 - --- Norms of Delta G(): 6.738217E-05 2.632826E-08 + --- H+ 1 1.841623E-09 1.841623E-09 -1.517386E+01 -1.517386E+01 1.414622E-07 1.416953E-08 + --- H2O 1 9.717868E-02 9.717867E-02 -1.240033E+02 -1.240033E+02 2.690517E-08 3.123176E-09 + --- NaCl 0 3.999646E-32 3.999640E-32 -1.745168E+02 -1.745168E+02 1.697581E-06 6.401422E-10 + --- Cl- 1 2.123019E-01 2.123019E-01 -7.237746E+01 -7.237746E+01 -2.799241E-08 -4.998000E-09 + --- H2 1 1.873673E-07 1.873672E-07 -3.261772E+01 -3.261772E+01 5.831922E-08 7.051398E-09 + --- O2 0 8.948274E-69 8.946597E-69 -1.827709E+02 -1.827711E+02 1.875027E-04 7.070759E-08 + --- Norms of Delta G(): 7.655082E-05 2.967941E-08 --- Phase_Name KMoles(after update) --- -------------------------------------------------- --- NaCl_electrolyte = 2.3274248E+00 @@ -3634,14 +2631,92 @@ VCS CALCULATION METHOD ------------------------------------------------------------------------------------------------------- --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 --- Total New Dimensionless Gibbs Free Energy = -1.2128673458838E+03 - --- Increment counter increased, step is accepted: 44 + --- Increment counter increased, step is accepted: 30 --- Normal element abundance check - passed --- Check for an optimum basis passed --- Reevaluate major-minor status of noncomponents: + --- Equilibrium check for major species: H+ failed + +============================================================================================================== + Iteration = 30, Iterations since last evaluation of optimal basis = 28 (only major species) + --- vcs_popPhaseID() called + --- Phase Status F_e MoleNum + -------------------------------------------------------------- + --- NaCl_electrolyte 2 NA 2.327e+00 + --- air 2 NA 4.097e+00 + --- NaCl(S) 2 NA 4.788e+00 + -------------------------------------------------------------- + ---------------------------------------------------------------------------------- + --- Subroutine vcs_RxnStepSizes called - Details: + ---------------------------------------------------------------------------------- + --- Species KMoles Rxn_Adjustment DeltaG | Comment + --- H+ 1.8416E-09 -1.3047E-17 1.4170E-08 | Normal calc: diag adjusted from 1.086e+09 to 1.086e+09 due to act coeff + --- H2O 9.7179E-02 -3.0444E-10 3.1232E-09 | Normal calc: diag adjusted from 10.1421 to 10.2589 due to act coeff + --- NaCl 3.9996E-32 0.0000E+00 6.4014E-10 | Skipped: IC = 0 and DG >0: 6.401E-10 + --- Cl- 2.1230E-01 2.9261E-10 -4.9980E-09 | Normal calc: diag adjusted from 7.70191 to 17.0805 due to act coeff + --- H2 1.8737E-07 -4.4040E-16 7.0514E-09 | Normal calc: diag adjusted from 1.60113e+07 to 1.60113e+07 due to act coeff + --- O2 8.9466E-69 0.0000E+00 7.0708E-08 | Skipped: IC = 0 and DG >0: 7.071E-08 + ---------------------------------------------------------------------------------- + --- Main Loop Treatment of each non-component species - Major Components Calculation: + --- Species IC KMoles Tent_KMoles Rxn_Adj | Comment + --- H+ 1 1.8416E-09 1.8416E-09-1.3047E-17 | Normal Major Calc + --- H2O 1 9.7179E-02 9.7179E-02-3.0444E-10 | Normal Major Calc + --- NaCl 0 3.9996E-32 3.9996E-32 0.0000E+00 | minor species not considered + --- Cl- 1 2.1230E-01 2.1230E-01 2.9261E-10 | Normal Major Calc + --- H2 1 1.8737E-07 1.8737E-07-4.4040E-16 | Normal Major Calc + --- O2 0 8.9466E-69 8.9466E-69 0.0000E+00 | minor species not considered + --- NaCl(S) c 4.7877E+00 4.7877E+00-2.9261E-10 | + --- N2 c 4.0000E+00 4.0000E+00 0.0000E+00 | + --- H2O(L) c 1.9028E+00 1.9028E+00 3.0444E-10 | + --- Na+ c 2.1230E-01 2.1230E-01 2.9261E-10 | + --- OH- c 1.8416E-09 1.8416E-09-1.3047E-17 | + --- OH c 3.7473E-07 3.7473E-07-8.8080E-16 | + --- CO2 c 0.0000E+00 0.0000E+00 0.0000E+00 | + -------------------------------------------------------------------------------- + --- Finished Main Loop + --- Subroutine vcs_dfe called for all species using tentative solution + --- Subroutine vcs_deltag called for all noncomponents + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 + --- Total tentative Dimensionless Gibbs Free Energy = -1.2128673458838E+03 + --- subroutine FORCE: Beginning Slope = -2.4133e-18 + --- subroutine FORCE: End Slope = -3.39523e-19 + --- subroutine FORCE produced no adjustments, s2 < 0 + ------------------------------------------------------------------------------------------------------- + --- Summary of the Update (only major species): + --- Species Status Initial_KMoles Final_KMoles Initial_Mu/RT Mu/RT Init_Del_G/RT Delta_G/RT + --- NaCl(S) 4.787698E+00 4.787698E+00 -1.745168E+02 -1.745168E+02 + --- N2 4.000000E+00 4.000000E+00 -2.306923E+01 -2.306923E+01 + --- H2O(L) 1.902821E+00 1.902821E+00 -1.240033E+02 -1.240033E+02 + --- Na+ 2.123019E-01 2.123019E-01 -1.021393E+02 -1.021393E+02 + --- OH- 1.841623E-09 1.841623E-09 -1.088294E+02 -1.088294E+02 + --- OH 3.747345E-07 3.747345E-07 -1.076944E+02 -1.076944E+02 + --- CO2 0.000000E+00 0.000000E+00 -5.082240E+02 -5.082240E+02 + --- H+ 1 1.841623E-09 1.841623E-09 -1.517386E+01 -1.517386E+01 1.416953E-08 2.931955E-09 + --- H2O 1 9.717867E-02 9.717867E-02 -1.240033E+02 -1.240033E+02 3.123176E-09 5.576481E-10 + --- NaCl 0 3.999640E-32 3.999640E-32 -1.745168E+02 -1.745168E+02 6.401422E-10 7.144649E-10 + --- Cl- 1 2.123019E-01 2.123019E-01 -7.237746E+01 -7.237746E+01 -4.998000E-09 -5.801297E-10 + --- H2 1 1.873672E-07 1.873672E-07 -3.261772E+01 -3.261772E+01 7.051398E-09 1.208747E-09 + --- O2 0 8.946597E-69 8.946597E-69 -1.827711E+02 -1.827711E+02 7.070759E-08 7.890071E-08 + --- Norms of Delta G(): 2.967941E-08 3.224008E-08 + --- Phase_Name KMoles(after update) + --- -------------------------------------------------- + --- NaCl_electrolyte = 2.3274248E+00 + --- air = 4.0971792E+00 + --- NaCl(S) = 4.7876981E+00 + ------------------------------------------------------------------------------------------------------- + --- Total Old Dimensionless Gibbs Free Energy = -1.2128673458838E+03 + --- Total New Dimensionless Gibbs Free Energy = -1.2128673458838E+03 + --- Increment counter increased, step is accepted: 31 + --- Normal element abundance check - passed + --- Check for an optimum basis passed --- Equilibrium check for major species: MAJOR SPECIES CONVERGENCE achieved + --- Subroutine vcs_dfe called for components and minors + --- Subroutine vcs_deltag called for minor noncomponents --- Equilibrium check for minor species: CONVERGENCE achieved --- Subroutine vcs_deltag called for all noncomponents --- Equilibrium check for major species: MAJOR SPECIES CONVERGENCE achieved + --- Subroutine vcs_dfe called for components and minors + --- Subroutine vcs_deltag called for minor noncomponents --- Equilibrium check for minor species: CONVERGENCE achieved --- Check the Full Element Abundances: passed --- Start rechecking deleted species in multispec phases @@ -3671,11 +2746,11 @@ VCS CALCULATION METHOD OH 3.7473450E-07 9.1461582E-08 -1.0769E+02 0 CO2 0.0000000E+00 0.0000000E+00 -5.0822E+02 0 Cl- 2.1230193E-01 9.1217525E-02 -7.2377E+01 KMolNum - H2O 9.7178675E-02 2.3718434E-02 -1.2400E+02 KMolNum + H2O 9.7178674E-02 2.3718434E-02 -1.2400E+02 KMolNum H2 1.8736725E-07 4.5730791E-08 -3.2618E+01 KMolNum H+ 1.8416226E-09 7.9127051E-10 -1.5174E+01 KMolNum NaCl 3.9996395E-32 9.7619345E-33 -1.7452E+02 KMolNum - O2 8.9465966E-69 2.1835990E-69 -1.8277E+02 KMolNum + O2 8.9465967E-69 2.1835990E-69 -1.8277E+02 KMolNum -------------------------------------------------------------------------------- @@ -3684,12 +2759,12 @@ VCS CALCULATION METHOD | Components| NaCl(S) N2 H2O(L) Na+ OH- OH CO2 | | NonComponent | Moles | 4.79 4 1.9 0.212 1.84e-09 3.75e-07 0 | DG/RT Rxn | ------------------------------------------------------------------------------------------------------------------- - 7 H+ | 1.84e-09 | 0.00 0.00 -1.00 0.00 1.00 0.00 0.00 | 9.65e-09 | - 8 H2O | 0.0972 | 0.00 0.00 -1.00 0.00 0.00 0.00 0.00 | 2.34e-09 | - 9 NaCl | 4e-32 | -1.00 0.00 0.00 0.00 0.00 0.00 0.00 | 5.73e-10 | - 10 Cl- | 0.212 | -1.00 0.00 0.00 1.00 0.00 0.00 0.00 | -4.47e-09 | - 11 H2 | 1.87e-07 | 0.00 0.00 -2.00 0.00 0.00 2.00 0.00 | 5.39e-09 | - 12 O2 | 8.95e-69 | 0.00 0.00 2.00 0.00 0.00 -4.00 0.00 | 6.33e-08 | + 7 H+ | 1.84e-09 | 0.00 0.00 -1.00 0.00 1.00 0.00 0.00 | 2.93e-09 | + 8 H2O | 0.0972 | 0.00 0.00 -1.00 0.00 0.00 0.00 0.00 | 5.58e-10 | + 9 NaCl | 4e-32 | -1.00 0.00 0.00 0.00 0.00 0.00 0.00 | 7.14e-10 | + 10 Cl- | 0.212 | -1.00 0.00 0.00 1.00 0.00 0.00 0.00 | -5.8e-10 | + 11 H2 | 1.87e-07 | 0.00 0.00 -2.00 0.00 0.00 2.00 0.00 | 1.21e-09 | + 12 O2 | 8.95e-69 | 0.00 0.00 2.00 0.00 0.00 -4.00 0.00 | 7.89e-08 | ------------------------------------------------------------------------------------------------------------------- @@ -3700,9 +2775,9 @@ VCS CALCULATION METHOD | Element | O H C N Na Cl cn_NaCl_el Fe E Si Ca | | PhaseName |KMolTarget | 2 4 0 8 5 5 0 0 0 0 0 | Gibbs Total | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - 0 NaCl_electro | 2.327e+00 | 1.9 3.81 0 0 0.212 0.212 0 0 0 0 0 | -2.73006234858E+02 | - 1 air | 4.097e+00 | 0.0972 0.194 0 8 4e-32 4e-32 0 0 0 0 0 | -1.04327434163E+02 | - 2 NaCl(S) | 4.788e+00 | 0 0 0 0 4.79 4.79 0 0 0 0 0 | -8.35533676862E+02 | + 0 NaCl_electro | 2.327e+00 | 1.9 3.81 0 0 0.212 0.212 0 0 0 0 0 | -2.73006234929E+02 | + 1 air | 4.097e+00 | 0.0972 0.194 0 8 4e-32 4e-32 0 0 0 0 0 | -1.04327434136E+02 | + 2 NaCl(S) | 4.788e+00 | 0 0 0 0 4.79 4.79 0 0 0 0 0 | -8.35533676818E+02 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ TOTAL | 1.121e+01 | 2 4 0 8 5 5 0 0 0 0 0 | -1.21286734588E+03 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -3729,32 +2804,32 @@ Chemical Potentials of the Species: (dimensionless) (RT = 2.47896e+06 J/kmol) Name TKMoles StandStateChemPot ln(AC) ln(X_i) | F z_i phi | ChemPot | (-lnMnaught)| (MolNum ChemPot)| --------------------------------------------------------------------------------------------------------------------------------------------------- - NaCl(S) 4.7876981E+00 -1.7451679E+02 0.0000000E+00 0.0000000E+00 | 0.0000000E+00 | -1.7452E+02 | | -8.355336769E+02 | + NaCl(S) 4.7876981E+00 -1.7451679E+02 0.0000000E+00 0.0000000E+00 | 0.0000000E+00 | -1.7452E+02 | | -8.355336768E+02 | N2 4.0000000E+00 -2.3045225E+01 0.0000000E+00 -2.4004385E-02 | 0.0000000E+00 | -2.3069E+01 | | -9.227691608E+01 | - H2O(L) 1.9028209E+00 -1.2371551E+02 -8.6317425E-02 -2.0142493E-01 | 0.0000000E+00 | -1.2400E+02 | | -2.359559843E+02 | - Na+ 2.1230193E-01 -1.0397591E+02 2.1455966E-01 -2.3945082E+00 | 0.0000000E+00 | -1.0214E+02 |(4.01653E+00)| -2.168437492E+01 | - OH- 1.8416226E-09 -9.1483483E+01 -4.0506365E-01 -2.0957381E+01 |-0.0000000E+00 | -1.0883E+02 |(4.01653E+00)| -2.004226729E-07 | - OH 3.7473450E-07 -9.1487045E+01 0.0000000E+00 -1.6207347E+01 | 0.0000000E+00 | -1.0769E+02 | | -4.035680387E-05 | + H2O(L) 1.9028209E+00 -1.2371551E+02 -8.6317426E-02 -2.0142493E-01 | 0.0000000E+00 | -1.2400E+02 | | -2.359559843E+02 | + Na+ 2.1230193E-01 -1.0397591E+02 2.1455966E-01 -2.3945082E+00 | 0.0000000E+00 | -1.0214E+02 |(4.01653E+00)| -2.168437494E+01 | + OH- 1.8416226E-09 -9.1483483E+01 -4.0506365E-01 -2.0957381E+01 |-0.0000000E+00 | -1.0883E+02 |(4.01653E+00)| -2.004226720E-07 | + OH 3.7473450E-07 -9.1487045E+01 0.0000000E+00 -1.6207347E+01 | 0.0000000E+00 | -1.0769E+02 | | -4.035680380E-05 | CO2 0.0000000E+00 -1.8445182E+02 0.0000000E+00 -3.2377221E+02 | 0.0000000E+00 | -5.0822E+02 | | -0.000000000E+00 | - Cl- 2.1230193E-01 -7.4214051E+01 2.1455966E-01 -2.3945082E+00 |-0.0000000E+00 | -7.2377E+01 |(4.01653E+00)| -1.536587544E+01 | - H2O 9.7178675E-02 -1.2026175E+02 0.0000000E+00 -3.7415027E+00 | 0.0000000E+00 | -1.2400E+02 | | -1.205047162E+01 | - H2 1.8736725E-07 -1.5717224E+01 0.0000000E+00 -1.6900494E+01 | 0.0000000E+00 | -3.2618E+01 | | -6.111492083E-06 | - H+ 1.8416226E-09 0.0000000E+00 1.7669883E+00 -2.0957381E+01 | 0.0000000E+00 | -1.5174E+01 |(4.01653E+00)| -2.794452014E-08 | - NaCl 3.9996395E-32 -1.0080997E+02 0.0000000E+00 -7.3706817E+01 | 0.0000000E+00 | -1.7452E+02 | | -6.980042318E-30 | - O2 8.9465966E-69 -2.4673669E+01 0.0000000E+00 -1.5809740E+02 | 0.0000000E+00 | -1.8277E+02 | | -1.635178995E-66 | + Cl- 2.1230193E-01 -7.4214051E+01 2.1455966E-01 -2.3945082E+00 |-0.0000000E+00 | -7.2377E+01 |(4.01653E+00)| -1.536587545E+01 | + H2O 9.7178674E-02 -1.2026175E+02 0.0000000E+00 -3.7415027E+00 | 0.0000000E+00 | -1.2400E+02 | | -1.205047159E+01 | + H2 1.8736725E-07 -1.5717224E+01 0.0000000E+00 -1.6900494E+01 | 0.0000000E+00 | -3.2618E+01 | | -6.111492072E-06 | + H+ 1.8416226E-09 0.0000000E+00 1.7669883E+00 -2.0957381E+01 | 0.0000000E+00 | -1.5174E+01 |(4.01653E+00)| -2.794452002E-08 | + NaCl 3.9996395E-32 -1.0080997E+02 0.0000000E+00 -7.3706817E+01 | 0.0000000E+00 | -1.7452E+02 | | -6.980042319E-30 | + O2 8.9465967E-69 -2.4673669E+01 0.0000000E+00 -1.5809740E+02 | 0.0000000E+00 | -1.8277E+02 | | -1.635179010E-66 | -1.212867346E+03 --------------------------------------------------------------------------------------------------------------------------------------------------- Counters: Iterations Time (seconds) vcs_basopt: 3 NA - vcs_TP: 44 NA + vcs_TP: 31 NA -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- TCounters: Num_Calls Total_Its Total_Time (seconds) vcs_basopt: 3 3 NA - vcs_TP: 1 44 NA + vcs_TP: 1 31 NA vcs_inest: 0 NA vcs_TotalTime: NA diff --git a/test_problems/VCSnonideal/NaCl_equil/good_out.txt b/test_problems/VCSnonideal/NaCl_equil/good_out.txt index c05870be1..c9c8d1085 100644 --- a/test_problems/VCSnonideal/NaCl_equil/good_out.txt +++ b/test_problems/VCSnonideal/NaCl_equil/good_out.txt @@ -199,11 +199,11 @@ VCS CALCULATION METHOD OH 3.7473450E-07 9.1461582E-08 -1.0769E+02 0 CO2 0.0000000E+00 0.0000000E+00 -5.0822E+02 0 Cl- 2.1230193E-01 9.1217525E-02 -7.2377E+01 KMolNum - H2O 9.7178675E-02 2.3718434E-02 -1.2400E+02 KMolNum + H2O 9.7178674E-02 2.3718434E-02 -1.2400E+02 KMolNum H2 1.8736725E-07 4.5730791E-08 -3.2618E+01 KMolNum H+ 1.8416226E-09 7.9127051E-10 -1.5174E+01 KMolNum NaCl 3.9996395E-32 9.7619345E-33 -1.7452E+02 KMolNum - O2 8.9465966E-69 2.1835990E-69 -1.8277E+02 KMolNum + O2 8.9465967E-69 2.1835990E-69 -1.8277E+02 KMolNum -------------------------------------------------------------------------------- @@ -212,12 +212,12 @@ VCS CALCULATION METHOD | Components| NaCl(S) N2 H2O(L) Na+ OH- OH CO2 | | NonComponent | Moles | 4.79 4 1.9 0.212 1.84e-09 3.75e-07 0 | DG/RT Rxn | ------------------------------------------------------------------------------------------------------------------- - 7 H+ | 1.84e-09 | 0.00 0.00 -1.00 0.00 1.00 0.00 0.00 | 9.65e-09 | - 8 H2O | 0.0972 | 0.00 0.00 -1.00 0.00 0.00 0.00 0.00 | 2.34e-09 | - 9 NaCl | 4e-32 | -1.00 0.00 0.00 0.00 0.00 0.00 0.00 | 5.73e-10 | - 10 Cl- | 0.212 | -1.00 0.00 0.00 1.00 0.00 0.00 0.00 | -4.47e-09 | - 11 H2 | 1.87e-07 | 0.00 0.00 -2.00 0.00 0.00 2.00 0.00 | 5.39e-09 | - 12 O2 | 8.95e-69 | 0.00 0.00 2.00 0.00 0.00 -4.00 0.00 | 6.33e-08 | + 7 H+ | 1.84e-09 | 0.00 0.00 -1.00 0.00 1.00 0.00 0.00 | 2.93e-09 | + 8 H2O | 0.0972 | 0.00 0.00 -1.00 0.00 0.00 0.00 0.00 | 5.58e-10 | + 9 NaCl | 4e-32 | -1.00 0.00 0.00 0.00 0.00 0.00 0.00 | 7.14e-10 | + 10 Cl- | 0.212 | -1.00 0.00 0.00 1.00 0.00 0.00 0.00 | -5.8e-10 | + 11 H2 | 1.87e-07 | 0.00 0.00 -2.00 0.00 0.00 2.00 0.00 | 1.21e-09 | + 12 O2 | 8.95e-69 | 0.00 0.00 2.00 0.00 0.00 -4.00 0.00 | 7.89e-08 | ------------------------------------------------------------------------------------------------------------------- @@ -228,9 +228,9 @@ VCS CALCULATION METHOD | Element | O H C N Na Cl cn_NaCl_el Fe E Si Ca | | PhaseName |KMolTarget | 2 4 0 8 5 5 0 0 0 0 0 | Gibbs Total | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - 0 NaCl_electro | 2.327e+00 | 1.9 3.81 0 0 0.212 0.212 0 0 0 0 0 | -2.73006234858E+02 | - 1 air | 4.097e+00 | 0.0972 0.194 0 8 4e-32 4e-32 0 0 0 0 0 | -1.04327434163E+02 | - 2 NaCl(S) | 4.788e+00 | 0 0 0 0 4.79 4.79 0 0 0 0 0 | -8.35533676862E+02 | + 0 NaCl_electro | 2.327e+00 | 1.9 3.81 0 0 0.212 0.212 0 0 0 0 0 | -2.73006234929E+02 | + 1 air | 4.097e+00 | 0.0972 0.194 0 8 4e-32 4e-32 0 0 0 0 0 | -1.04327434136E+02 | + 2 NaCl(S) | 4.788e+00 | 0 0 0 0 4.79 4.79 0 0 0 0 0 | -8.35533676818E+02 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ TOTAL | 1.121e+01 | 2 4 0 8 5 5 0 0 0 0 0 | -1.21286734588E+03 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -257,32 +257,32 @@ Chemical Potentials of the Species: (dimensionless) (RT = 2.47896e+06 J/kmol) Name TKMoles StandStateChemPot ln(AC) ln(X_i) | F z_i phi | ChemPot | (-lnMnaught)| (MolNum ChemPot)| --------------------------------------------------------------------------------------------------------------------------------------------------- - NaCl(S) 4.7876981E+00 -1.7451679E+02 0.0000000E+00 0.0000000E+00 | 0.0000000E+00 | -1.7452E+02 | | -8.355336769E+02 | + NaCl(S) 4.7876981E+00 -1.7451679E+02 0.0000000E+00 0.0000000E+00 | 0.0000000E+00 | -1.7452E+02 | | -8.355336768E+02 | N2 4.0000000E+00 -2.3045225E+01 0.0000000E+00 -2.4004385E-02 | 0.0000000E+00 | -2.3069E+01 | | -9.227691608E+01 | - H2O(L) 1.9028209E+00 -1.2371551E+02 -8.6317425E-02 -2.0142493E-01 | 0.0000000E+00 | -1.2400E+02 | | -2.359559843E+02 | - Na+ 2.1230193E-01 -1.0397591E+02 2.1455966E-01 -2.3945082E+00 | 0.0000000E+00 | -1.0214E+02 |(4.01653E+00)| -2.168437492E+01 | - OH- 1.8416226E-09 -9.1483483E+01 -4.0506365E-01 -2.0957381E+01 |-0.0000000E+00 | -1.0883E+02 |(4.01653E+00)| -2.004226729E-07 | - OH 3.7473450E-07 -9.1487045E+01 0.0000000E+00 -1.6207347E+01 | 0.0000000E+00 | -1.0769E+02 | | -4.035680387E-05 | + H2O(L) 1.9028209E+00 -1.2371551E+02 -8.6317426E-02 -2.0142493E-01 | 0.0000000E+00 | -1.2400E+02 | | -2.359559843E+02 | + Na+ 2.1230193E-01 -1.0397591E+02 2.1455966E-01 -2.3945082E+00 | 0.0000000E+00 | -1.0214E+02 |(4.01653E+00)| -2.168437494E+01 | + OH- 1.8416226E-09 -9.1483483E+01 -4.0506365E-01 -2.0957381E+01 |-0.0000000E+00 | -1.0883E+02 |(4.01653E+00)| -2.004226720E-07 | + OH 3.7473450E-07 -9.1487045E+01 0.0000000E+00 -1.6207347E+01 | 0.0000000E+00 | -1.0769E+02 | | -4.035680380E-05 | CO2 0.0000000E+00 -1.8445182E+02 0.0000000E+00 -3.2377221E+02 | 0.0000000E+00 | -5.0822E+02 | | -0.000000000E+00 | - Cl- 2.1230193E-01 -7.4214051E+01 2.1455966E-01 -2.3945082E+00 |-0.0000000E+00 | -7.2377E+01 |(4.01653E+00)| -1.536587544E+01 | - H2O 9.7178675E-02 -1.2026175E+02 0.0000000E+00 -3.7415027E+00 | 0.0000000E+00 | -1.2400E+02 | | -1.205047162E+01 | - H2 1.8736725E-07 -1.5717224E+01 0.0000000E+00 -1.6900494E+01 | 0.0000000E+00 | -3.2618E+01 | | -6.111492083E-06 | - H+ 1.8416226E-09 0.0000000E+00 1.7669883E+00 -2.0957381E+01 | 0.0000000E+00 | -1.5174E+01 |(4.01653E+00)| -2.794452014E-08 | - NaCl 3.9996395E-32 -1.0080997E+02 0.0000000E+00 -7.3706817E+01 | 0.0000000E+00 | -1.7452E+02 | | -6.980042318E-30 | - O2 8.9465966E-69 -2.4673669E+01 0.0000000E+00 -1.5809740E+02 | 0.0000000E+00 | -1.8277E+02 | | -1.635178995E-66 | + Cl- 2.1230193E-01 -7.4214051E+01 2.1455966E-01 -2.3945082E+00 |-0.0000000E+00 | -7.2377E+01 |(4.01653E+00)| -1.536587545E+01 | + H2O 9.7178674E-02 -1.2026175E+02 0.0000000E+00 -3.7415027E+00 | 0.0000000E+00 | -1.2400E+02 | | -1.205047159E+01 | + H2 1.8736725E-07 -1.5717224E+01 0.0000000E+00 -1.6900494E+01 | 0.0000000E+00 | -3.2618E+01 | | -6.111492072E-06 | + H+ 1.8416226E-09 0.0000000E+00 1.7669883E+00 -2.0957381E+01 | 0.0000000E+00 | -1.5174E+01 |(4.01653E+00)| -2.794452002E-08 | + NaCl 3.9996395E-32 -1.0080997E+02 0.0000000E+00 -7.3706817E+01 | 0.0000000E+00 | -1.7452E+02 | | -6.980042319E-30 | + O2 8.9465967E-69 -2.4673669E+01 0.0000000E+00 -1.5809740E+02 | 0.0000000E+00 | -1.8277E+02 | | -1.635179010E-66 | -1.212867346E+03 --------------------------------------------------------------------------------------------------------------------------------------------------- Counters: Iterations Time (seconds) vcs_basopt: 3 NA - vcs_TP: 44 NA + vcs_TP: 31 NA -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- TCounters: Num_Calls Total_Its Total_Time (seconds) vcs_basopt: 3 3 NA - vcs_TP: 1 44 NA + vcs_TP: 1 31 NA vcs_inest: 0 NA vcs_TotalTime: NA diff --git a/test_problems/VCSnonideal/NaCl_equil/vcs_equilibrate_blessed.csv b/test_problems/VCSnonideal/NaCl_equil/vcs_equilibrate_blessed.csv index 536181252..1c69fa7fb 100644 --- a/test_problems/VCSnonideal/NaCl_equil/vcs_equilibrate_blessed.csv +++ b/test_problems/VCSnonideal/NaCl_equil/vcs_equilibrate_blessed.csv @@ -3,7 +3,7 @@ Temperature = 298.15 kelvin Pressure = 1.0132e+05 Pascal Total Volume = 100.41 m**3 Number Basis optimizations = 3 -Number VCS iterations = 44 +Number VCS iterations = 31 Name, Phase, PhaseMoles, Mole_Fract, Molalities, ActCoeff, Activity,ChemPot_SS0, ChemPot, mole_num, PMVol, Phase_Volume , , (kmol), , , , , (J/kmol), (J/kmol), (kmol), (m**3/kmol), (m**3) H2O(L), NaCl_electrolyte, 2.327e+00, 8.176e-01, 5.551e+01, 9.173e-01, 7.500e-01, -3.067e+02, -3.074e+02, 1.903e+00, 1.800e-02, 3.838e-02