diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index cf0532b0f3a9079454779e4cb04a1054277129b3..510f7d4236631404dea74eecb2886c3600d2cb4c 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -37,7 +37,6 @@ volVectorField U volScalarField& p = thermo->p(); const volScalarField& psi = thermo->psi(); -const volScalarField& T = thermo->T(); volScalarField& h = thermo->h(); @@ -99,5 +98,5 @@ volScalarField dQ IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("zero", dimensionSet(1,-3,-1,0,0,0,0), 0.0) + dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0, 0, 0), 0.0) ); diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index f49288b36ec26ad2c712a9f824cfd5b3ddc4a9ce..6536eb32ce6425f2efd66f0e0530b9ae3750dc1c 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -46,8 +46,8 @@ do fi done -paraviewMajor=paraview-3.5 -export ParaView_VERSION=3.5-cvs +paraviewMajor=paraview-3.6 +export ParaView_VERSION=3.6 export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index 1c500f4962544271b887b812dff67f268cf89c04..66c7e1a54f283c56121c74164e482b7b221d437d 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -44,8 +44,8 @@ foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 ) endif end -set paraviewMajor=paraview-3.5 -setenv ParaView_VERSION 3.5-cvs +set paraviewMajor=paraview-3.6 +setenv ParaView_VERSION 3.6 setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C index bbf58e49a04cfd0ccf3891ea318cf5824b6d2557..b836c1c412663db6213081458eee60b883b3cfe4 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C @@ -276,15 +276,15 @@ Foam::Ostream& Foam::operator<< scalarField YSolidLoc = p.YSolid()*p.Y()[2]; if (os.format() == IOstream::ASCII) { - os << static_cast<const ReactingMultiphaseParcel<ParcelType>&>(p) + os << static_cast<const ReactingParcel<ParcelType>&>(p) << token::SPACE << YGasLoc << token::SPACE << YLiquidLoc << token::SPACE << YSolidLoc; } else { - os << static_cast<const ReactingMultiphaseParcel<ParcelType>&>(p); - os << YGasLoc << YLiquidLoc << YSolidLoc; + os << static_cast<const ReactingParcel<ParcelType>&>(p); + os << YGasLoc << YLiquidLoc << YSolidLoc; } // Check state of Ostream