Changes due to compilation problems on solaris

Cantera/src/equil/ChemEquil.cpp

@@ -59,7 +59,10 @@ namespace Cantera {
     else if (flag == "SP") return SP;
     else if (flag == "SV") return SV;
     else if (flag == "UP") return UP;
-    else throw CanteraError("_equilflag","unknown property pair "+flag);
+    else {
+      throw CanteraError("_equilflag","unknown property pair "+flag);
+    }
+    return -1;
   }
 
 

Cantera/src/equil/equilibrate.cpp

@@ -27,7 +27,7 @@ namespace Cantera {
   doublereal equilibrate(MultiPhase& s, const char* XY, 
 			 doublereal tol, int maxsteps, int maxiter, 
 			 int loglevel) {
-
+    
     if (loglevel > 0) {
       beginLogGroup("equilibrate",loglevel);
       addLogEntry("multiphase equilibrate function");
@@ -65,9 +65,9 @@ namespace Cantera {
 	endLogGroup("equilibrate");
       }
       throw CanteraError("equilibrate","unsupported option");
-      //return -1.0;
+      return -1.0;
     }
-    
+    return 0.0; 
   }
 
   /*

Cantera/src/kinetics/Kinetics.cpp

@@ -213,6 +213,7 @@ namespace Cantera {
       if (k >= 0) return thermo(n);
     }
     throw CanteraError("speciesPhase", "unknown species "+nm);
+    return thermo(0);
   }
 
   /**
@@ -228,8 +229,8 @@ namespace Cantera {
 	return n;
       }
     }
-    throw CanteraError("speciesPhaseIndex", 
-		       "illegal species index: "+int2str(k));
+    throw CanteraError("speciesPhaseIndex", "illegal species index: "+int2str(k));
+    return -1;
   }
 
   /*

Cantera/src/numerics/ODE_integrators.cpp

@@ -22,6 +22,7 @@ namespace Cantera {
             throw CanteraError("newIntegrator",
                 "unknown ODE integrator: "+itype);
         }
+        return 0;
     }
 
     void deleteIntegrator(Integrator *cv) {

Cantera/src/oneD/Domain1D.cpp

@@ -190,7 +190,8 @@ namespace Cantera {
 
     doublereal Domain1D::initialValue(int n, int j) { 
         throw CanteraError("Domain1D::initialValue",
-            "base class method called!");
+                           "base class method called!");
+        return 0.0;
     }
     
 

Cantera/src/oneD/OneDim.cpp

@@ -64,6 +64,7 @@ namespace Cantera {
             if (domain(n).id() == name) return n;
         }
         throw CanteraError("OneDim::domainIndex","no domain named >>"+name+"<<");
+        return -1;
     }
 
 

Cantera/src/oneD/boundaries1D.cpp

@@ -117,10 +117,14 @@ namespace Cantera {
     string Inlet1D::
     componentName(int n) const { 
         switch (n) {
-        case 0: return "mdot"; break;
-        case 1: return "temperature"; break;
-        default: return "unknown";
+        case 0: 
+          return "mdot";
+        case 1: 
+          return "temperature"; 
+        default: 
+          break;
         }
+        return "unknown";
     }
 
     void Inlet1D::
@@ -271,9 +275,12 @@ namespace Cantera {
 
     string Empty1D::componentName(int n) const { 
         switch (n) {
-        case 0: return "dummy"; break;
-        default: return "<unknown>";
+        case 0: 
+          return "dummy";
+        default: 
+          break;
         }
+        return "<unknown>";
     }
 
     void Empty1D::
@@ -326,9 +333,12 @@ namespace Cantera {
 
     string Symm1D::componentName(int n) const { 
         switch (n) {
-        case 0: return "dummy"; break;
-        default: return "<unknown>";
+        case 0: 
+          return "dummy"; 
+        default: 
+          break;
         }
+        return "<unknown>";
     }
 
     void Symm1D::
@@ -405,9 +415,12 @@ namespace Cantera {
 
     string Outlet1D::componentName(int n) const { 
         switch (n) {
-        case 0: return "outlet dummy"; break;
-        default: return "<unknown>";
+        case 0: 
+          return "outlet dummy"; 
+        default: 
+          break;
         }
+        return "<unknown>";
     }
 
     void Outlet1D::
@@ -522,9 +535,12 @@ namespace Cantera {
  
     string OutletRes1D::componentName(int n) const { 
         switch (n) {
-        case 0: return "dummy"; break;
-        default: return "<unknown>";
+        case 0:
+           return "dummy";
+        default: 
+           break;
         }
+        return "<unknown>";
     }
 
     void OutletRes1D::
@@ -641,9 +657,12 @@ namespace Cantera {
 
     string Surf1D::componentName(int n) const { 
         switch (n) {
-        case 0: return "temperature"; break;
-        default: return "<unknown>";
+        case 0:
+          return "temperature";
+        default:
+          break;
         }
+        return "<unknown>";
     }
 
     void Surf1D::

Cantera/src/thermo/Elements.cpp

@@ -321,10 +321,10 @@ namespace Cantera {
    * index. If m < 0 or m >= nElements() an exception is thrown.
    */
   string Elements::elementName(int m) const {
-    if (m >= 0 && m < nElements())  
-      return m_elementNames[m];
-    else
+    if (m < 0 || m >= nElements()) {
       throw ElementRangeError("Elements::elementName", m, nElements());
+    }
+    return m_elementNames[m];
   }
 
 

Cantera/src/thermo/HMWSoln.cpp

@@ -792,7 +792,7 @@ namespace Cantera {
   doublereal HMWSoln::isothermalCompressibility() const {
     throw CanteraError("HMWSoln::isothermalCompressibility",
 		       "unimplemented");
-    //return 0.0;
+    return 0.0;
   }
 
   /*

Cantera/src/thermo/IdealSolidSolnPhase.cpp

@@ -494,13 +494,10 @@ namespace Cantera {
     switch (m_formGC) {
     case 0:
       return 1.0;
-      break;
     case 1:
       return 1.0 / m_speciesMolarVolume[k];
-      break;
     case 2:
       return 1.0/m_speciesMolarVolume[m_kk-1];
-      break;
     }
     return 0.0;
   }
@@ -509,13 +506,10 @@ namespace Cantera {
     switch (m_formGC) {
     case 0:
       return 1.0;
-      break;
     case 1:
       return 1.0 / m_speciesMolarVolume[k];
-      break;
     case 2:
       return 1.0 / m_speciesMolarVolume[m_kk-1];
-      break;
     }
     return 0.0;
   }

Cantera/src/thermo/State.cpp

@@ -96,6 +96,7 @@ namespace Cantera {
       throw CanteraError("State:moleFraction",
 			 "illegal species index number");
     }
+    return 0.0;
   }
 
   void State::setMoleFractions(const doublereal* const x) {
@@ -126,20 +127,16 @@ namespace Cantera {
     if (k >= 0 && k < m_kk) {
       return m_y[k];
     }
-    else {
-      throw CanteraError("State:massFraction",
-			 "illegal species index number");
-    }
+    throw CanteraError("State:massFraction", "illegal species index number");
+    return 0.0;
   }
 
   doublereal State::concentration(const int k) const {
     if (k >= 0 && k < m_kk) {
       return m_y[k] * m_dens * m_rmolwts[k] ;
     }
-    else {
-      throw CanteraError("State:massFraction",
-			 "illegal species index number");
-    }
+    throw CanteraError("State:massFraction", "illegal species index number");
+    return 0.0;
   }
 
   void State::setMassFractions(const doublereal* const y) {

Cantera/src/thermo/VPSSMgrFactory.cpp

@@ -351,22 +351,17 @@ namespace Cantera {
     switch (type) {
     case cVPSSMGR_IDEALGAS:
       return new VPSSMgr_IdealGas(vp_ptr, &spthermoRef);
-      break;
     case cVPSSMGR_CONSTVOL:
       return new VPSSMgr_ConstVol(vp_ptr, &spthermoRef);
-      break;
     case cVPSSMGR_PUREFLUID:
       throw CanteraError("VPSSMgrFactory::newVPSSMgr",
 			 "unimplemented");
     case cVPSSMGR_WATER_CONSTVOL:
       return new VPSSMgr_Water_ConstVol(vp_ptr, &spthermoRef);
-      break;
     case cVPSSMGR_WATER_HKFT:
       return new VPSSMgr_Water_HKFT(vp_ptr, &spthermoRef);
-      break;
     case cVPSSMGR_GENERAL:
       return new VPSSMgr_General(vp_ptr, &spthermoRef);
-      break;
     case cVPSSMGR_UNDEF:
     default:
       throw UnknownVPSSMgrModel("VPSSMgrFactory::newVPSSMgr", int2str(type));

Cantera/src/thermo/WaterPropsIAPWS.cpp

@@ -875,4 +875,4 @@ doublereal WaterPropsIAPWS::molarVolume() const {
   return (M_water / rho);
 }
 
-};
+}

Cantera/src/zeroD/ReactorFactory.cpp

@@ -67,6 +67,7 @@ namespace CanteraZeroD {
             throw CanteraError("ReactorFactory::newReactor",
                 "unknown reactor type!");
         }
+        return 0;
     }
 
 }