Updated to the latest dev version

acuoci · e8c3a73d9b1e66bca18716e8c3f5a3c72a603459 · acuoci committed Jul 8, 2017 · Jul 8, 2017 · e8c3a73
1 parent e292039
commit e8c3a73d9b1e66bca18716e8c3f5a3c72a603459
diff --git a/libs/boundaryConditionsOpenSMOKE++/Make/options b/libs/boundaryConditionsOpenSMOKE++/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
      $(OPENFOAM_VERSION) \
+     $(DEVVERSION) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
diff --git a/libs/radiationOpenSMOKE++/Make/options b/libs/radiationOpenSMOKE++/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
      $(OPENFOAM_VERSION) \
+     $(DEVVERSION) \
     -I$(OPENSMOKE_LIBRARY_PATH) \
     -I$(BOOST_LIBRARY_PATH)/include \
     -I$(EIGEN_LIBRARY_PATH) \
diff --git a/libs/radiationOpenSMOKE++/include/laminarSMOKEthermoClass.C b/libs/radiationOpenSMOKE++/include/laminarSMOKEthermoClass.C
@@ -29,7 +29,12 @@ namespace Foam
 		IOobject::NO_WRITE
 	    );
 
+	    // check if field exists and can be read
+            #if DEVVERSION == 1
+	    if (io.typeHeaderOk<volScalarField>(true))
+	    #else
 	    if (io.headerOk())
+	    #endif
 	    {
 		io.readOpt() = IOobject::NO_READ;
 		return io;
diff --git a/.../radiationOpenSMOKE++/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/.../radiationOpenSMOKE++/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -151,7 +151,11 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
         );
 
         // Check if field exists and can be read
+        #if DEVVERSION == 1
+        if (IHeader.typeHeaderOk<volScalarField>(true))
+        #else
         if (IHeader.headerOk())
+        #endif
         {
             ILambda_.set
             (
diff --git a/libs/radiationOpenSMOKE++/radiationModels/radiationModel/OpenSMOKEradiationModel.C b/libs/radiationOpenSMOKE++/radiationModels/radiationModel/OpenSMOKEradiationModel.C
@@ -57,7 +57,11 @@ Foam::IOobject Foam::radiation::OpenSMOKEradiationModel::createIOobject
         IOobject::NO_WRITE
     );
 
+    #if DEVVERSION == 1
+    if (io.typeHeaderOk<volScalarField>(true))
+    #else
     if (io.headerOk())
+    #endif
     {
         io.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
         return io;
diff --git a/libs/radiationOpenSMOKE++/radiationModels/radiationModel/OpenSMOKEradiationModelNew.C b/libs/radiationOpenSMOKE++/radiationModels/radiationModel/OpenSMOKEradiationModelNew.C
@@ -45,7 +45,11 @@ Foam::radiation::OpenSMOKEradiationModel::New
     );
 
     word modelType("none");
+    #if DEVVERSION == 1
+    if (radIO.typeHeaderOk<volScalarField>(true))
+    #else
     if (radIO.headerOk())
+    #endif
     {
         IOdictionary(radIO).lookup("radiationModel") >> modelType;
     }
diff --git a/mybashrc.complete b/mybashrc.complete
@@ -2,6 +2,9 @@
 #OpenFOAM-dev is equivalent to 40
 export OPENFOAM_VERSION='-DOPENFOAM_VERSION=40'
 
+#If OpenFOAM dev version is used, this must be equal to 1
+export DEVVERSION='-DDEVVERSION=0'
+
 #Compulsory path
 export EIGEN_LIBRARY_PATH=/software/chimica2/libraries/eigen/eigen-3.3.3
 export BOOST_LIBRARY_PATH=/software/chimica2/libraries/boost/boost-1.64.0-gcc-6.3.0
diff --git a/mybashrc.minimalist b/mybashrc.minimalist
@@ -2,6 +2,9 @@
 #OpenFOAM-dev is equivalent to 40
 export OPENFOAM_VERSION='-DOPENFOAM_VERSION=40'
 
+#If OpenFOAM dev version is used, this must be equal to 1
+export DEVVERSION='-DDEVVERSION=0'
+
 #Compulsory path
 export EIGEN_LIBRARY_PATH=/software/chimica2/libraries/eigen/eigen-3.3.3
 export BOOST_LIBRARY_PATH=/software/chimica2/libraries/boost/boost-1.64.0-gcc-6.3.0
diff --git a/mybashrc.minimalist.mkl b/mybashrc.minimalist.mkl
@@ -2,6 +2,9 @@
 #OpenFOAM-dev is equivalent to 40
 export OPENFOAM_VERSION='-DOPENFOAM_VERSION=40'
 
+#If OpenFOAM dev version is used, this must be equal to 1
+export DEVVERSION='-DDEVVERSION=0'
+
 #Compulsory path
 export EIGEN_LIBRARY_PATH=/software/chimica2/libraries/eigen/eigen-3.3.3
 export BOOST_LIBRARY_PATH=/software/chimica2/libraries/boost/boost-1.64.0-gcc-6.3.0
diff --git a/solvers/laminarBuoyantPimpleSMOKE/Make/options b/solvers/laminarBuoyantPimpleSMOKE/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -w \
     $(MKL_SUPPORT) \
     $(ISAT_SUPPORT) \
+    $(DEVVERSION) \
     $(EXTERNAL_ODE_SOLVERS) \
     -I../laminarSMOKE \
     -I../laminarSMOKE/unsteady \
diff --git a/solvers/laminarBuoyantSimpleSMOKE/Make/options b/solvers/laminarBuoyantSimpleSMOKE/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -w \
     $(MKL_SUPPORT) \
     $(ISAT_SUPPORT) \
+    $(DEVVERSION) \
     $(EXTERNAL_ODE_SOLVERS) \
     -I../laminarSMOKE \
     -I../laminarSMOKE/steady \
diff --git a/solvers/laminarPimpleSMOKE/Make/options b/solvers/laminarPimpleSMOKE/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -w \
     $(MKL_SUPPORT) \
     $(ISAT_SUPPORT) \
+    $(DEVVERSION) \
     $(EXTERNAL_ODE_SOLVERS) \
     -I../laminarSMOKE \
     -I../laminarSMOKE/unsteady \
diff --git a/solvers/laminarSMOKE/createChemicalFields.H b/solvers/laminarSMOKE/createChemicalFields.H
@@ -176,7 +176,11 @@ for(int i=0;i<thermodynamicsMapXML->NumberOfSpecies();i++)
 	}
 
 	// check if field exists and can be read
+	#if DEVVERSION == 1
+	if (header.typeHeaderOk<volScalarField>(true))
+	#else
 	if (header.headerOk())
+	#endif
 	{
 		Info << thermodynamicsMapXML->NamesOfSpecies()[i] << endl;
 		Y.set
diff --git a/solvers/laminarSMOKEpostProcessor/Make/options b/solvers/laminarSMOKEpostProcessor/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -w \
     $(MKL_SUPPORT) \
     $(ISAT_SUPPORT) \
+    $(DEVVERSION) \
     $(EXTERNAL_ODE_SOLVERS) \
     -I../laminarSMOKE \
     -I../../libs/radiationOpenSMOKE++/lnInclude \
diff --git a/solvers/laminarSMOKEpostProcessor/readSpecies.H b/solvers/laminarSMOKEpostProcessor/readSpecies.H
@@ -63,7 +63,11 @@ if (calculateConcentrations == true)
 		);
 
 		// check if field exists and can be read
+		#if DEVVERSION == 1
+		if (header.typeHeaderOk<volScalarField>(true))
+		#else
 		if (header.headerOk())
+		#endif
 		{
 			std::cout << " * " << thermodynamicsMapXML->NamesOfSpecies()[i] << " -> from file..." << std::endl;
 			Y.set
diff --git a/solvers/laminarSimpleSMOKE/Make/options b/solvers/laminarSimpleSMOKE/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -w \
     $(MKL_SUPPORT) \
     $(ISAT_SUPPORT) \
+    $(DEVVERSION) \
     $(EXTERNAL_ODE_SOLVERS) \
     -I../laminarSMOKE \
     -I../laminarSMOKE/steady \