diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C index 1e6ddfe0c1..6cd29ccca8 100644 --- a/applications/solvers/combustion/dieselFoam/dieselFoam.C +++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C @@ -94,6 +94,8 @@ int main(int argc, char *argv[]) kappa = (runTime.deltaT() + tc)/(runTime.deltaT()+tc+tk); } + chemistrySh = kappa*chemistry.Sh()(); + #include "rhoEqn.H" #include "UEqn.H" diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H index 2dc6e7af70..ddb1f663ad 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H @@ -10,9 +10,32 @@ ) ); - label nIntervals(readLabel(pdfDictionary.lookup("nIntervals"))); + const label nIntervals(readLabel(pdfDictionary.lookup("nIntervals"))); - label nSamples(readLabel(pdfDictionary.lookup("nSamples"))); + const label nSamples(readLabel(pdfDictionary.lookup("nSamples"))); + + const bool writeData(readBool(pdfDictionary.lookup("writeData"))); + + + const fileName pdfPath = runTime.path()/"pdf"; + mkDir(pdfPath); + + Random rndGen(label(0)); + + autoPtr p(pdfs::pdf::New(pdfDictionary, rndGen)); + + const scalar xMin = p->minValue(); + const scalar xMax = p->maxValue(); + + autoPtr filePtr(NULL); + if (writeData) + { + fileName fName = pdfPath/(p->type() + ".data"); + Info<< "Writing " << p->type() << " data samples to file:" << nl + << fName << nl << endl; + + filePtr.reset(new OFstream(fName)); + } scalarField samples(nIntervals, 0); diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict index 2a48115bea..d236d5ea8b 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict @@ -23,6 +23,10 @@ nSamples 10000; // Type of pdf pdfType RosinRammler; +// Write data flag +writeData true; + +// PDF model coefficients RosinRammlerPDF { minValue 1e-06; diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C index 3347e4dcdb..b88f0ca1cf 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,6 +30,7 @@ Description #include "fvCFD.H" #include "pdf.H" #include "makeGraph.H" +#include "OFstream.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Main program: @@ -40,16 +41,6 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createFields.H" - fileName pdfPath = runTime.path()/"pdf"; - mkDir(pdfPath); - - Random rndGen(label(0)); - - autoPtr p(pdf::New(pdfDictionary, rndGen)); - - scalar xMin = p->minValue(); - scalar xMax = p->maxValue(); - label iCheck = 100; for (label i=1; i<=nSamples; i++) { @@ -57,6 +48,11 @@ int main(int argc, char *argv[]) label n = label((ps - xMin)*nIntervals/(xMax - xMin)); samples[n]++; + if (writeData) + { + filePtr() << ps << nl; + } + if (i % iCheck == 0) { Info<< " processed " << i << " samples" << endl; diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H index 884c3cabd7..8f70d6989d 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H +++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H @@ -26,8 +26,8 @@ Class Foam::interpolationTable Description - A list of times and values. - The time values must be positive and monotonically increasing. + An interpolation/look-up table of scalar vs values. + The reference scalar values must be positive and monotonically increasing. The handling of out-of-bounds values depends on the current setting of @a outOfBounds. diff --git a/src/finiteVolume/cfdTools/general/bound/bound.C b/src/finiteVolume/cfdTools/general/bound/bound.C index 7054434c0f..93dac0faf9 100644 --- a/src/finiteVolume/cfdTools/general/bound/bound.C +++ b/src/finiteVolume/cfdTools/general/bound/bound.C @@ -30,7 +30,8 @@ License // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // -void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound) +Foam::volScalarField& +Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound) { const scalar minVsf = min(vsf).value(); @@ -55,6 +56,8 @@ void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound) vsf.boundaryField() = max(vsf.boundaryField(), lowerBound.value()); } + + return vsf; } diff --git a/src/finiteVolume/cfdTools/general/bound/bound.H b/src/finiteVolume/cfdTools/general/bound/bound.H index f301c5a217..1f6418ce5c 100644 --- a/src/finiteVolume/cfdTools/general/bound/bound.H +++ b/src/finiteVolume/cfdTools/general/bound/bound.H @@ -50,8 +50,9 @@ namespace Foam // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // //- Bound the given scalar field if it has gone unbounded. +// Return the bounded field. // Used extensively in RAS and LES turbulence models. -void bound(volScalarField&, const dimensionedScalar& lowerBound); +volScalarField& bound(volScalarField&, const dimensionedScalar& lowerBound); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C index 661a2ea7b2..bf1a792c6f 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C @@ -55,7 +55,7 @@ Foam::ChomiakInjector::ChomiakInjector ChomiakDict_(dict.subDict(typeName + "Coeffs")), dropletPDF_ ( - pdf::New + pdfs::pdf::New ( ChomiakDict_.subDict("dropletPDF"), sm.rndGen() diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H index 50de0a31dc..87c2d1d816 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H @@ -64,7 +64,7 @@ private: dictionary ChomiakDict_; - autoPtr dropletPDF_; + autoPtr dropletPDF_; scalarList maxSprayAngle_; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C index 883dc9c431..e266181c9c 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C @@ -55,7 +55,7 @@ Foam::definedHollowConeInjector::definedHollowConeInjector definedHollowConeDict_(dict.subDict(typeName + "Coeffs")), dropletPDF_ ( - pdf::New + pdfs::pdf::New ( definedHollowConeDict_.subDict("dropletPDF"), sm.rndGen() diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H index 56d6241892..d5318120ec 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H @@ -61,7 +61,7 @@ private: typedef VectorSpace, scalar, 2> pair; dictionary definedHollowConeDict_; - autoPtr dropletPDF_; + autoPtr dropletPDF_; // inner and outer cone angle time histories // 2 column vectors = (time, coneAngle) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C index 40508fda7e..28bed642e0 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C @@ -55,7 +55,7 @@ Foam::hollowConeInjector::hollowConeInjector hollowConeDict_(dict.subDict(typeName + "Coeffs")), dropletPDF_ ( - pdf::New + pdfs::pdf::New ( hollowConeDict_.subDict("dropletPDF"), sm.rndGen() diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H index 985d7c6073..6df6552174 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H @@ -59,7 +59,7 @@ private: dictionary hollowConeDict_; - autoPtr dropletPDF_; + autoPtr dropletPDF_; scalarList innerAngle_; scalarList outerAngle_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index b9cbf0f921..6d38ad3ba8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -120,7 +120,7 @@ Foam::ConeInjection::ConeInjection ), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 5e6498e3d4..41c299b027 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -97,7 +97,7 @@ class ConeInjection const autoPtr > thetaOuter_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; // Tangential vectors to the direction vector diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C index e59eba322e..8b02e7057a 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C @@ -151,7 +151,7 @@ Foam::ConeInjectionMP::ConeInjectionMP ), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H index 238d0463ef..a517866689 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H @@ -104,7 +104,7 @@ class ConeInjectionMP const autoPtr > thetaOuter_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; //- Number of parcels per injector already injected mutable label nInjected_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C index a1353be80c..f8599dcceb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C @@ -115,7 +115,7 @@ Foam::FieldActivatedInjection::FieldActivatedInjection diameters_(positions_.size()), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H index c2f1e3cef4..e58df9c379 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H @@ -106,7 +106,7 @@ class FieldActivatedInjection scalarList diameters_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C index ad829f3978..0bf8e62e4d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C @@ -94,7 +94,7 @@ Foam::ManualInjection::ManualInjection U0_(this->coeffDict().lookup("U0")), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H index b04fee48b5..e4642f6124 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H @@ -75,7 +75,7 @@ class ManualInjection const vector U0_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; //- Number of particles represented by each parcel scalar nParticlesPerParcel_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C index 4e88b90bfe..198ba8e13d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C @@ -93,7 +93,7 @@ Foam::PatchInjection::PatchInjection ), parcelPDF_ ( - pdf::New + pdfs::pdf::New ( this->coeffDict().subDict("parcelPDF"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 05117ce3be..1338d5bbda 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -84,7 +84,7 @@ class PatchInjection const autoPtr > volumeFlowRate_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr parcelPDF_; //- Cell owners labelList cellOwners_; diff --git a/src/thermophysicalModels/pdfs/Make/files b/src/thermophysicalModels/pdfs/Make/files index e5d66e3aea..7b0c50a956 100644 --- a/src/thermophysicalModels/pdfs/Make/files +++ b/src/thermophysicalModels/pdfs/Make/files @@ -1,17 +1,12 @@ -pdf = pdf -uniform = uniform -normal = normal -general = general -exponential = exponential -RosinRammler = RosinRammler +pdf/pdf.C +pdf/newPdf.C -$(pdf)/pdf.C -$(pdf)/newPdf.C - -$(uniform)/uniform.C -$(normal)/normal.C -$(general)/general.C -$(exponential)/exponential.C -$(RosinRammler)/RosinRammler.C +exponential/exponential.C +fixedValue/fixedValue.C +general/general.C +multiNormal/multiNormal.C +normal/normal.C +RosinRammler/RosinRammler.C +uniform/uniform.C LIB = $(FOAM_LIBBIN)/libpdf diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C index becfd94db2..efa7a21750 100644 --- a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C +++ b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,106 +31,52 @@ License namespace Foam { - defineTypeNameAndDebug(RosinRammler, 0); - - addToRunTimeSelectionTable(pdf, RosinRammler, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(RosinRammler, 0); + addToRunTimeSelectionTable(pdf, RosinRammler, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::RosinRammler::RosinRammler(const dictionary& dict, Random& rndGen) +Foam::pdfs::RosinRammler::RosinRammler(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - d_(pdfDict_.lookup("d")), - n_(pdfDict_.lookup("n")), - ls_(d_), - range_(maxValue_ - minValue_) + d_(readScalar(pdfDict_.lookup("d"))), + n_(readScalar(pdfDict_.lookup("n"))) { - if (minValue_<0) - { - FatalErrorIn - ( - "RosinRammler::RosinRammler(const dictionary& dict)" - ) << " minValue = " << minValue_ << ", it must be >0." << nl - << abort(FatalError); - } - - if (maxValue_p); + scalar K = 1.0 - exp(-pow((maxValue_ - minValue_)/d_, n_)); + scalar y = rndGen_.scalar01(); + scalar x = minValue_ + d_*::pow(-log(1.0 - y*K), 1.0/n_); return x; } -Foam::scalar Foam::RosinRammler::minValue() const +Foam::scalar Foam::pdfs::RosinRammler::minValue() const { return minValue_; } -Foam::scalar Foam::RosinRammler::maxValue() const +Foam::scalar Foam::pdfs::RosinRammler::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H index 6b04f3dfbb..370f0d2ad2 100644 --- a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H +++ b/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,14 +29,12 @@ Description Rosin-Rammler pdf @f[ - pdf = ( x/d )^n \exp ( -( x/d )^n ) + cumulative pdf = (1.0 - exp( -((x - d0)/d)^n ) / (1.0 - exp( -((d1 - d0)/d)^n ) @f] SourceFiles - RosinRammlerI.H RosinRammler.C - RosinRammlerIO.C \*---------------------------------------------------------------------------*/ @@ -49,9 +47,11 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ - Class RosinRammler Declaration + Class RosinRammler Declaration \*---------------------------------------------------------------------------*/ class RosinRammler @@ -60,17 +60,16 @@ class RosinRammler { // Private data - dictionary pdfDict_; - - //- min and max values of the distribution + //- Distribution minimum scalar minValue_; + + //- Distribution maximum scalar maxValue_; - List d_; - List n_; - List ls_; + // Model coefficients - scalar range_; + scalar d_; + scalar n_; public: @@ -108,6 +107,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/pdfs/exponential/exponential.C b/src/thermophysicalModels/pdfs/exponential/exponential.C index 8498c2c9e2..7e97f4ae20 100644 --- a/src/thermophysicalModels/pdfs/exponential/exponential.C +++ b/src/thermophysicalModels/pdfs/exponential/exponential.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ - #include "exponential.H" #include "addToRunTimeSelectionTable.H" @@ -32,92 +31,49 @@ License namespace Foam { - defineTypeNameAndDebug(exponential, 0); - addToRunTimeSelectionTable(pdf, exponential, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(exponential, 0); + addToRunTimeSelectionTable(pdf, exponential, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::exponential::exponential(const dictionary& dict, Random& rndGen) +Foam::pdfs::exponential::exponential(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - lambda_(pdfDict_.lookup("lambda")), - ls_(lambda_), - range_(maxValue_ - minValue_) + lambda_(readScalar(pdfDict_.lookup("lambda"))) { - if (minValue_<0) - { - FatalErrorIn - ( - "exponential::exponential(const dictionary& dict)" - ) << " minValue = " << minValue_ << ", it must be >0." << nl - << abort(FatalError); - } - - scalar sMax = 0; - label n = lambda_.size(); - for (label i=0; iy); - - return x; + scalar y = rndGen_.scalar01(); + scalar K = exp(-lambda_*maxValue_) - exp(-lambda_*minValue_); + return -(1.0/lambda_)*log(exp(-lambda_*minValue_) + y*K); } -Foam::scalar Foam::exponential::minValue() const +Foam::scalar Foam::pdfs::exponential::minValue() const { return minValue_; } -Foam::scalar Foam::exponential::maxValue() const +Foam::scalar Foam::pdfs::exponential::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/exponential/exponential.H b/src/thermophysicalModels/pdfs/exponential/exponential.H index 4ef19b75a3..eb452a6dd5 100644 --- a/src/thermophysicalModels/pdfs/exponential/exponential.H +++ b/src/thermophysicalModels/pdfs/exponential/exponential.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ Description exponential pdf SourceFiles - exponentialI.H exponential.C - exponentialIO.C \*---------------------------------------------------------------------------*/ @@ -44,6 +42,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class exponential Declaration @@ -55,16 +55,17 @@ class exponential { // Private data - dictionary pdfDict_; - - //- min and max values of the distribution + //- Distribution minimum scalar minValue_; + + //- Distribution maximum scalar maxValue_; - List lambda_; - List ls_; - scalar range_; + // Model coefficients + + scalar lambda_; + public: @@ -101,14 +102,11 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//#include "exponentialI.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/fixedValue/fixedValue.C b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.C new file mode 100644 index 0000000000..a160803549 --- /dev/null +++ b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.C @@ -0,0 +1,76 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +#include "fixedValue.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + namespace pdfs + { + defineTypeNameAndDebug(fixedValue, 0); + addToRunTimeSelectionTable(pdf, fixedValue, dictionary); + } +} + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::pdfs::fixedValue::fixedValue(const dictionary& dict, Random& rndGen) +: + pdf(typeName, dict, rndGen), + value_(readScalar(pdfDict_.lookup("value"))) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::pdfs::fixedValue::~fixedValue() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::scalar Foam::pdfs::fixedValue::fixedValue::sample() const +{ + return value_; +} + + +Foam::scalar Foam::pdfs::fixedValue::fixedValue::minValue() const +{ + return -VGREAT; +} + + +Foam::scalar Foam::pdfs::fixedValue::fixedValue::maxValue() const +{ + return VGREAT; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/fixedValue/fixedValue.H b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.H new file mode 100644 index 0000000000..e64b1c2a13 --- /dev/null +++ b/src/thermophysicalModels/pdfs/fixedValue/fixedValue.H @@ -0,0 +1,103 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Class + Foam::fixedValue + +Description + Returns a fixed value + +SourceFiles + fixedValue.C + +\*---------------------------------------------------------------------------*/ + +#ifndef pdfFixedValue_H +#define pdfFixedValue_H + +#include "pdf.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace pdfs +{ +/*---------------------------------------------------------------------------*\ + Class fixedValue Declaration +\*---------------------------------------------------------------------------*/ + +class fixedValue +: + public pdf +{ + // Private data + + //- Fixed value + scalar value_; + + +public: + + //- Runtime type information + TypeName("fixedValue"); + + + // Constructors + + //- Construct from components + fixedValue + ( + const dictionary& dict, + Random& rndGen + ); + + + //- Destructor + virtual ~fixedValue(); + + + // Member Functions + + //- Sample the pdf + virtual scalar sample() const; + + //- Return the minimum value + virtual scalar minValue() const; + + //- Return the maximum value + virtual scalar maxValue() const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace pdfs +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/general/general.C b/src/thermophysicalModels/pdfs/general/general.C index 33d3e3f57d..844e712683 100644 --- a/src/thermophysicalModels/pdfs/general/general.C +++ b/src/thermophysicalModels/pdfs/general/general.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,84 +31,109 @@ License namespace Foam { - defineTypeNameAndDebug(general, 0); - addToRunTimeSelectionTable(pdf, general, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(general, 0); + addToRunTimeSelectionTable(pdf, general, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::general::general(const dictionary& dict, Random& rndGen) +Foam::pdfs::general::general(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), xy_(pdfDict_.lookup("distribution")), nEntries_(xy_.size()), minValue_(xy_[0][0]), maxValue_(xy_[nEntries_-1][0]), - range_(maxValue_ - minValue_) + integral_(nEntries_) { - // normalize the pdf - scalar yMax = 0; + check(); - for (label i=0; i SMALL) + { + scalar p = 2.0*d/k; + scalar q = -2.0*alpha/k; + scalar sqrtEr = sqrt(0.25*p*p - q); + + scalar x1 = -0.5*p + sqrtEr; + scalar x2 = -0.5*p - sqrtEr; + if ((x1 >= xy_[n-1][0]) && (x1 <= xy_[n][0])) { - i++; - if ((x>xy_[i][0]) && (xy); + else + { + x = x2; + } + } + else + { + x = alpha/d; + } return x; } -Foam::scalar Foam::general::minValue() const +Foam::scalar Foam::pdfs::general::minValue() const { return minValue_; } -Foam::scalar Foam::general::maxValue() const +Foam::scalar Foam::pdfs::general::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/general/general.H b/src/thermophysicalModels/pdfs/general/general.H index 06c48feb18..609c0e6c4b 100644 --- a/src/thermophysicalModels/pdfs/general/general.H +++ b/src/thermophysicalModels/pdfs/general/general.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ Description general pdf SourceFiles - generalI.H general.C - generalIO.C \*---------------------------------------------------------------------------*/ @@ -44,6 +42,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class general Declaration @@ -55,8 +55,6 @@ class general { // Private data - dictionary pdfDict_; - typedef VectorSpace, scalar, 2> pair; List xy_; @@ -67,7 +65,7 @@ class general scalar minValue_; scalar maxValue_; - scalar range_; + List integral_; public: @@ -105,6 +103,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/pdfs/multiNormal/multiNormal.C b/src/thermophysicalModels/pdfs/multiNormal/multiNormal.C new file mode 100644 index 0000000000..2ce3942b6c --- /dev/null +++ b/src/thermophysicalModels/pdfs/multiNormal/multiNormal.C @@ -0,0 +1,133 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +#include "multiNormal.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + namespace pdfs + { + defineTypeNameAndDebug(multiNormal, 0); + addToRunTimeSelectionTable(pdf, multiNormal, dictionary); + } +} + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::pdfs::multiNormal::multiNormal(const dictionary& dict, Random& rndGen) +: + pdf(typeName, dict, rndGen), + minValue_(readScalar(pdfDict_.lookup("minValue"))), + maxValue_(readScalar(pdfDict_.lookup("maxValue"))), + range_(maxValue_ - minValue_), + expectation_(pdfDict_.lookup("expectation")), + variance_(pdfDict_.lookup("variance")), + strength_(pdfDict_.lookup("strength")) +{ + check(); + + scalar sMax = 0; + label n = strength_.size(); + for (label i=0; i expectation_; + List variance_; + List strength_; + + +public: + + //- Runtime type information + TypeName("multiNormal"); + + + // Constructors + + //- Construct from components + multiNormal + ( + const dictionary& dict, + Random& rndGen + ); + + + //- Destructor + virtual ~multiNormal(); + + + // Member Functions + + //- Sample the pdf + virtual scalar sample() const; + + //- Return the minimum value + virtual scalar minValue() const; + + //- Return the maximum value + virtual scalar maxValue() const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace pdfs +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/pdfs/normal/normal.C b/src/thermophysicalModels/pdfs/normal/normal.C index 4a66fc9883..c105372cef 100644 --- a/src/thermophysicalModels/pdfs/normal/normal.C +++ b/src/thermophysicalModels/pdfs/normal/normal.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,98 +26,97 @@ License #include "normal.H" #include "addToRunTimeSelectionTable.H" +#include "mathematicalConstants.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(normal, 0); - addToRunTimeSelectionTable(pdf, normal, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(normal, 0); + addToRunTimeSelectionTable(pdf, normal, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::normal::normal(const dictionary& dict, Random& rndGen) +Foam::pdfs::normal::normal(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - expectation_(pdfDict_.lookup("expectation")), - variance_(pdfDict_.lookup("variance")), - strength_(pdfDict_.lookup("strength")), - range_(maxValue_ - minValue_) + expectation_(readScalar(pdfDict_.lookup("expectation"))), + variance_(readScalar(pdfDict_.lookup("variance"))), + a_(0.147) { - scalar sMax = 0; - label n = strength_.size(); - for (label i=0; isortedToc() diff --git a/src/thermophysicalModels/pdfs/pdf/pdf.C b/src/thermophysicalModels/pdfs/pdf/pdf.C index 21945ca786..0f323dd56e 100644 --- a/src/thermophysicalModels/pdfs/pdf/pdf.C +++ b/src/thermophysicalModels/pdfs/pdf/pdf.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,22 +30,48 @@ License namespace Foam { - defineTypeNameAndDebug(pdf, 0); - defineRunTimeSelectionTable(pdf, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(pdf, 0); + defineRunTimeSelectionTable(pdf, dictionary); + } } +// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // + +void Foam::pdfs::pdf::check() const +{ + if (minValue() < 0) + { + FatalErrorIn("pdfs::pdf::check() const") + << type() << "PDF: Minimum value must be greater than zero." << nl + << "Supplied minValue = " << minValue() + << abort(FatalError); + } + + if (maxValue() < minValue()) + { + FatalErrorIn("pdfs::pdf::check() const") + << type() << "PDF: Maximum value is smaller than the minimum value:" + << nl << " maxValue = " << maxValue() + << ", minValue = " << minValue() + << abort(FatalError); + } +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdf::pdf(const dictionary& dict, Random& rndGen) +Foam::pdfs::pdf::pdf(const word& name, const dictionary& dict, Random& rndGen) : - dict_(dict), + pdfDict_(dict.subDict(name + "PDF")), rndGen_(rndGen) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdf::~pdf() +Foam::pdfs::pdf::~pdf() {} diff --git a/src/thermophysicalModels/pdfs/pdf/pdf.H b/src/thermophysicalModels/pdfs/pdf/pdf.H index ef1fa11b92..a3077ce9eb 100644 --- a/src/thermophysicalModels/pdfs/pdf/pdf.H +++ b/src/thermophysicalModels/pdfs/pdf/pdf.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,37 +26,27 @@ Class Foam::pdf Description - A library of runtime-selectable pdf's. + A library of runtime-selectable PDF's. Returns a sampled value given the expectation (nu) and variance (sigma^2) - Sample of planned pdfs (beta p. 374-375): - - binomial - - geometric - - Poisson - - hypergeometric - - Pascal - - uniform + Current PDF's include: - exponential + - fixedValue + - general + - multi-normal - normal - - Gamma - - chi - - t? - - F? - - beta - - Weibull - - Rayleigh - - Cauchy? + - Rosin-Rammler + - uniform The pdf is tabulated in equidistant nPoints, in an interval. - These values are integrated to obtain the cumulated pdf, + These values are integrated to obtain the cumulated PDF, which is then used to change the distribution from unifrom to the actual pdf. SourceFiles - pdfI.H pdf.C - pdfIO.C + newPdf.C \*---------------------------------------------------------------------------*/ @@ -71,6 +61,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class pdf Declaration @@ -83,11 +75,19 @@ protected: // Protected data - const dictionary& dict_; + //- Coefficients dictionary + const dictionary pdfDict_; + //- Reference to the randmo number generator Random& rndGen_; + // Protected member functions + + //- Check that the PDF is valid + virtual void check() const; + + public: //-Runtime type information @@ -111,7 +111,7 @@ public: // Constructors //- Construct from dictionary - pdf(const dictionary& dict, Random& rndGen); + pdf(const word& name, const dictionary& dict, Random& rndGen); //- Selector @@ -137,6 +137,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/pdfs/uniform/uniform.C b/src/thermophysicalModels/pdfs/uniform/uniform.C index 09c2c4b05a..817558fa88 100644 --- a/src/thermophysicalModels/pdfs/uniform/uniform.C +++ b/src/thermophysicalModels/pdfs/uniform/uniform.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,43 +31,47 @@ License namespace Foam { - defineTypeNameAndDebug(uniform, 0); - addToRunTimeSelectionTable(pdf, uniform, dictionary); + namespace pdfs + { + defineTypeNameAndDebug(uniform, 0); + addToRunTimeSelectionTable(pdf, uniform, dictionary); + } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::uniform::uniform(const dictionary& dict, Random& rndGen) +Foam::pdfs::uniform::uniform(const dictionary& dict, Random& rndGen) : - pdf(dict, rndGen), - pdfDict_(dict.subDict(typeName + "PDF")), + pdf(typeName, dict, rndGen), minValue_(readScalar(pdfDict_.lookup("minValue"))), maxValue_(readScalar(pdfDict_.lookup("maxValue"))), range_(maxValue_ - minValue_) -{} +{ + check(); +} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::uniform::~uniform() +Foam::pdfs::uniform::~uniform() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::uniform::sample() const +Foam::scalar Foam::pdfs::uniform::sample() const { return (minValue_ + rndGen_.scalar01()*range_); } -Foam::scalar Foam::uniform::minValue() const +Foam::scalar Foam::pdfs::uniform::minValue() const { return minValue_; } -Foam::scalar Foam::uniform::maxValue() const +Foam::scalar Foam::pdfs::uniform::maxValue() const { return maxValue_; } diff --git a/src/thermophysicalModels/pdfs/uniform/uniform.H b/src/thermophysicalModels/pdfs/uniform/uniform.H index 86b7542f34..f1d0de3688 100644 --- a/src/thermophysicalModels/pdfs/uniform/uniform.H +++ b/src/thermophysicalModels/pdfs/uniform/uniform.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,7 @@ Description uniform pdf SourceFiles - uniformI.H uniform.C - uniformIO.C \*---------------------------------------------------------------------------*/ @@ -44,6 +42,8 @@ SourceFiles namespace Foam { +namespace pdfs +{ /*---------------------------------------------------------------------------*\ Class uniform Declaration @@ -55,13 +55,13 @@ class uniform { // Private data - dictionary pdfDict_; - - //- min and max values of the distribution + //- Distribution minimum scalar minValue_; + + //- Distribution maximum scalar maxValue_; - // help-variable to avoid always having to calculate max-min + //- Distribution range scalar range_; @@ -100,6 +100,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace pdfs } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index 556ee0ca51..284d28a973 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -83,7 +83,7 @@ LESModel::LESModel delta_(LESdelta::New("delta", U.mesh(), *this)) { - readIfPresent("kMin", kMin_); + kMin_.readIfPresent(*this); // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 2c35c3cec0..f802f29a22 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -87,6 +87,10 @@ RASModel::RASModel y_(mesh_) { + kMin_.readIfPresent(*this); + epsilonMin_.readIfPresent(*this); + omegaMin_.readIfPresent(*this); + // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs mesh_.deltaCoeffs(); diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index 34966eb22c..5173c899c8 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -81,7 +81,7 @@ LESModel::LESModel kMin_("kMin", sqr(dimVelocity), SMALL), delta_(LESdelta::New("delta", U.mesh(), *this)) { - readIfPresent("kMin", kMin_); + kMin_.readIfPresent(*this); // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C index 708c090351..fe3a1b8ed6 100644 --- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -323,6 +323,8 @@ kOmegaSSTSAS::kOmegaSSTSAS mesh_ ) { + omegaMin_.readIfPresent(*this); + bound(k_, kMin_); bound(omega_, omegaMin_); @@ -458,6 +460,8 @@ bool kOmegaSSTSAS::read() zetaTilda2_.readIfPresent(coeffDict()); FSAS_.readIfPresent(coeffDict()); + omegaMin_.readIfPresent(*this); + return true; } else diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C index 5f036cff10..5212e7bbad 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -119,7 +119,7 @@ LamBremhorstKE::LamBremhorstKE y_(mesh_), - Rt_(sqr(k_)/(nu()*epsilon_)), + Rt_(sqr(k_)/(nu()*bound(epsilon_, epsilonMin_))), fMu_ ( @@ -141,7 +141,7 @@ LamBremhorstKE::LamBremhorstKE ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); nut_ = Cmu_*fMu_*sqr(k_)/epsilon_; nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C index d91f974fbe..c5c783f125 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C @@ -173,12 +173,12 @@ LienCubicKE::LienCubicKE gradU_(fvc::grad(U)), eta_ ( - k_/(epsilon_ + epsilonMin_) + k_/bound(epsilon_, epsilonMin_) *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T()))) ), ksi_ ( - k_/(epsilon_ + epsilonMin_) + k_/epsilon_ *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T()))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), @@ -235,7 +235,7 @@ LienCubicKE::LienCubicKE ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_; nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C index 046f5a6fa1..afd85ff475 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C @@ -222,12 +222,12 @@ LienCubicKELowRe::LienCubicKELowRe gradU_(fvc::grad(U)), eta_ ( - k_/(epsilon_ + epsilonMin_) + k_/bound(epsilon_, epsilonMin_) *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T()))) ), ksi_ ( - k_/(epsilon_ + epsilonMin_) + k_/epsilon_ *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T()))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), @@ -235,7 +235,7 @@ LienCubicKELowRe::LienCubicKELowRe C5viscosity_ ( - -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_ + epsilonMin_) + -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) *(magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T())) ), @@ -260,7 +260,7 @@ LienCubicKELowRe::LienCubicKELowRe symm ( // quadratic terms - pow3(k_)/sqr(epsilon_ + epsilonMin_) + pow3(k_)/sqr(epsilon_) *( Ctau1_/fEta_ *( @@ -271,7 +271,7 @@ LienCubicKELowRe::LienCubicKELowRe + Ctau3_/fEta_*(gradU_.T() & gradU_) ) // cubic term C4 - - 20.0*pow4(k_)/pow3(epsilon_ + epsilonMin_) + - 20.0*pow4(k_)/pow3(epsilon_) *pow3(Cmu_) *( ((gradU_ & gradU_) & gradU_.T()) @@ -289,7 +289,7 @@ LienCubicKELowRe::LienCubicKELowRe ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); nut_ = Cmu_ * (scalar(1) - exp(-Am_*yStar_)) diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C index c885d87f16..fdcae3d187 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C +++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C @@ -192,25 +192,25 @@ NonlinearKEShih::NonlinearKEShih gradU_(fvc::grad(U)), eta_ ( - k_/(epsilon_ + epsilonMin_) + k_/bound(epsilon_, epsilonMin_) *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T()))) ), ksi_ ( - k_/(epsilon_+ epsilonMin_) + k_/epsilon_ *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T()))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), fEta_(A2_ + pow(eta_, 3.0)), - nut_("nut", Cmu_*sqr(k_)/(epsilon_ + epsilonMin_)), + nut_("nut", Cmu_*sqr(k_)/epsilon_), nonlinearStress_ ( "nonlinearStress", symm ( - pow3(k_)/sqr(epsilon_ + epsilonMin_) + pow3(k_)/sqr(epsilon_) *( Ctau1_/fEta_ *( @@ -224,7 +224,7 @@ NonlinearKEShih::NonlinearKEShih ) { bound(k_, kMin_); - bound(epsilon_, epsilonMin_); + // already bounded: bound(epsilon_, epsilonMin_); #include "wallNonlinearViscosityI.H" diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index c7d97e08e9..8e1da1e5b5 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -86,6 +86,10 @@ RASModel::RASModel y_(mesh_) { + kMin_.readIfPresent(*this); + epsilonMin_.readIfPresent(*this); + omegaMin_.readIfPresent(*this); + // Force the construction of the mesh deltaCoeffs which may be needed // for the construction of the derived models and BCs mesh_.deltaCoeffs(); diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C index 422f8b1463..41b1114429 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C @@ -179,7 +179,7 @@ qZeta::qZeta IOobject::NO_READ, IOobject::AUTO_WRITE ), - epsilon_/(2.0*q_), + epsilon_/(2.0*bound(q_, qMin_)), epsilon_.boundaryField().types() ), @@ -198,7 +198,7 @@ qZeta::qZeta { bound(k_, kMin_); bound(epsilon_, epsilonMin_); - bound(q_, qMin_); + // already bounded: bound(q_, qMin_); bound(zeta_, zetaMin_); nut_ = Cmu_*fMu()*sqr(k_)/epsilon_; diff --git a/wmake/rules/General/X b/wmake/rules/General/X new file mode 100644 index 0000000000..f55fa8b32c --- /dev/null +++ b/wmake/rules/General/X @@ -0,0 +1,5 @@ +# X11 includes and libraries in the standard location +# +XFLAGS = +XINC = $(XFLAGS) -I/usr/include/X11 +XLIBS = -lXext -lX11 diff --git a/wmake/rules/General/flex b/wmake/rules/General/flex index 06defbb03d..7f726b34c4 100644 --- a/wmake/rules/General/flex +++ b/wmake/rules/General/flex @@ -1,6 +1,6 @@ .SUFFIXES: .l -ltoo = flex $$SOURCE ; mv lex.yy.c $*.c ; $(cc) $(cFLAGS) -c $*.c -o $@ +ltoo = flex -o $*.c $$SOURCE ; $(cc) $(cFLAGS) -c $*.c -o $@ .l.dep: $(MAKE_DEP) diff --git a/wmake/rules/General/flex++ b/wmake/rules/General/flex++ index 304b131c6d..7e7142aa53 100644 --- a/wmake/rules/General/flex++ +++ b/wmake/rules/General/flex++ @@ -1,6 +1,6 @@ .SUFFIXES: .L -Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ +Ltoo = flex -+ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@ .L.dep: $(MAKE_DEP) diff --git a/wmake/rules/General/flex++.test b/wmake/rules/General/flex++.test deleted file mode 100644 index 8503e57905..0000000000 --- a/wmake/rules/General/flex++.test +++ /dev/null @@ -1,6 +0,0 @@ -.SUFFIXES: .L - -Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ - -.L.dep: - $(MAKE_DEP) diff --git a/wmake/rules/General/general b/wmake/rules/General/general index 419d9b1d38..d0253e80b3 100644 --- a/wmake/rules/General/general +++ b/wmake/rules/General/general @@ -1,6 +1,7 @@ AR = ar ARFLAGS = cr RANLIB = ranlib +CPP = cpp LD = ld GFLAGS = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION) diff --git a/wmake/rules/linux64Gcc42/mplib b/wmake/rules/General/mplib similarity index 100% rename from wmake/rules/linux64Gcc42/mplib rename to wmake/rules/General/mplib diff --git a/wmake/rules/linux64Gcc42/mplibGAMMA b/wmake/rules/General/mplibGAMMA similarity index 100% rename from wmake/rules/linux64Gcc42/mplibGAMMA rename to wmake/rules/General/mplibGAMMA diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH index ac17f7c1d2..e5a38a8e38 100644 --- a/wmake/rules/General/mplibMPICH +++ b/wmake/rules/General/mplibMPICH @@ -1,3 +1,3 @@ -PFLAGS = +PFLAGS = -DMPICH_SKIP_MPICXX PINC = -I$(MPI_ARCH_PATH)/include PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc42/mplibMPICH-GM b/wmake/rules/General/mplibMPICH-GM similarity index 100% rename from wmake/rules/linux64Gcc42/mplibMPICH-GM rename to wmake/rules/General/mplibMPICH-GM diff --git a/wmake/rules/linux64Gcc42/mplibOPENMPI b/wmake/rules/General/mplibQSMPI similarity index 71% rename from wmake/rules/linux64Gcc42/mplibOPENMPI rename to wmake/rules/General/mplibQSMPI index 834d2d3e22..95ea327379 100644 --- a/wmake/rules/linux64Gcc42/mplibOPENMPI +++ b/wmake/rules/General/mplibQSMPI @@ -1,3 +1,4 @@ -PFLAGS = -DOMPI_SKIP_MPICXX +PFLAGS = PINC = -I$(MPI_ARCH_PATH)/include PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi + diff --git a/wmake/rules/SiCortex64Gcc/flex++ b/wmake/rules/SiCortex64Gcc/flex++ deleted file mode 100644 index d745628aab..0000000000 --- a/wmake/rules/SiCortex64Gcc/flex++ +++ /dev/null @@ -1,6 +0,0 @@ -.SUFFIXES: .L - -Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ - -.L.dep: - $(MAKE_DEP) diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general index d70a77cdb0..eb820ab36d 100644 --- a/wmake/rules/SiCortex64Gcc/general +++ b/wmake/rules/SiCortex64Gcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -A64 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/SiCortex64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general index f9b5632198..d24e8f0056 100644 --- a/wmake/rules/SunOS64Gcc/general +++ b/wmake/rules/SunOS64Gcc/general @@ -1,4 +1,4 @@ -CPP = /lib/cpp $(GFLAGS) +CPP = /lib/cpp LD = ld -64 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/SunOS64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/SunOS64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/SunOS64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/SunOS64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X deleted file mode 100644 index 47480abd22..0000000000 --- a/wmake/rules/linux64Gcc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/include/X11 -XLIBS = -L/usr/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Gcc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/dirToString b/wmake/rules/linux64Gcc/dirToString deleted file mode 100755 index 8a0125352d..0000000000 Binary files a/wmake/rules/linux64Gcc/dirToString and /dev/null differ diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linux64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linux64Gcc/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linux64Gcc/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linux64Gcc/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linux64Gcc/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc/wmkdep b/wmake/rules/linux64Gcc/wmkdep deleted file mode 100755 index 949570b0ba..0000000000 Binary files a/wmake/rules/linux64Gcc/wmkdep and /dev/null differ diff --git a/wmake/rules/linux64Gcc42/X b/wmake/rules/linux64Gcc42/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Gcc42/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc42/c b/wmake/rules/linux64Gcc42/c deleted file mode 100644 index 80bb80f32f..0000000000 --- a/wmake/rules/linux64Gcc42/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m64 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ - -LINK_LIBS = $(cDBUG) - -LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Gcc42/c++ b/wmake/rules/linux64Gcc42/c++ deleted file mode 100644 index 677b1e5bb4..0000000000 --- a/wmake/rules/linux64Gcc42/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m64 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-60 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) diff --git a/wmake/rules/linux64Gcc42/c++Debug b/wmake/rules/linux64Gcc42/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linux64Gcc42/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64Gcc42/c++Opt b/wmake/rules/linux64Gcc42/c++Opt deleted file mode 100644 index 3446f7f58c..0000000000 --- a/wmake/rules/linux64Gcc42/c++Opt +++ /dev/null @@ -1,4 +0,0 @@ -c++DBUG = -c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/linux64Gcc42/c++Prof b/wmake/rules/linux64Gcc42/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linux64Gcc42/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linux64Gcc42/cDebug b/wmake/rules/linux64Gcc42/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linux64Gcc42/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linux64Gcc42/cOpt b/wmake/rules/linux64Gcc42/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linux64Gcc42/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linux64Gcc42/cProf b/wmake/rules/linux64Gcc42/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linux64Gcc42/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linux64Gcc42/dirToString b/wmake/rules/linux64Gcc42/dirToString deleted file mode 100755 index 0560cadf77..0000000000 Binary files a/wmake/rules/linux64Gcc42/dirToString and /dev/null differ diff --git a/wmake/rules/linux64Gcc42/general b/wmake/rules/linux64Gcc42/general deleted file mode 100644 index d70a77cdb0..0000000000 --- a/wmake/rules/linux64Gcc42/general +++ /dev/null @@ -1,10 +0,0 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld -A64 - -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/X -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linux64Gcc42/mplibHPMPI b/wmake/rules/linux64Gcc42/mplibHPMPI deleted file mode 100644 index 574492a236..0000000000 --- a/wmake/rules/linux64Gcc42/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi diff --git a/wmake/rules/linux64Gcc42/mplibMPICH b/wmake/rules/linux64Gcc42/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc42/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI deleted file mode 120000 index cc63a574c3..0000000000 --- a/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI +++ /dev/null @@ -1 +0,0 @@ -../General/mplibSYSTEMOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc42/wmkdep b/wmake/rules/linux64Gcc42/wmkdep deleted file mode 100755 index f37b2ea3d3..0000000000 Binary files a/wmake/rules/linux64Gcc42/wmkdep and /dev/null differ diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Gcc43/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Gcc43/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc43/general +++ b/wmake/rules/linux64Gcc43/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linux64Gcc43/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linux64Gcc43/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc43/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linux64Gcc43/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Gcc43/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linux64Gcc43/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linux64Gcc43/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Gcc44/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Gcc44/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc44/general +++ b/wmake/rules/linux64Gcc44/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linux64Gcc44/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linux64Gcc44/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Gcc44/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linux64Gcc44/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Gcc44/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linux64Gcc44/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linux64Gcc44/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X deleted file mode 100644 index 5d1f9c5cc5..0000000000 --- a/wmake/rules/linux64Icc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linux64Icc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Icc/general +++ b/wmake/rules/linux64Icc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linux64Icc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linux64Icc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linux64Icc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linux64Icc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linux64Icc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linux64Icc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxGcc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxGcc/dirToString b/wmake/rules/linuxGcc/dirToString deleted file mode 100755 index f2244e3dca..0000000000 Binary files a/wmake/rules/linuxGcc/dirToString and /dev/null differ diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxGcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxGcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxGcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc/wmkdep b/wmake/rules/linuxGcc/wmkdep deleted file mode 100755 index ca4e0a882f..0000000000 Binary files a/wmake/rules/linuxGcc/wmkdep and /dev/null differ diff --git a/wmake/rules/linuxGcc42/X b/wmake/rules/linuxGcc42/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc42/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc42/c b/wmake/rules/linuxGcc42/c deleted file mode 100644 index 8db5da1047..0000000000 --- a/wmake/rules/linuxGcc42/c +++ /dev/null @@ -1,16 +0,0 @@ -.SUFFIXES: .c .h - -cWARN = -Wall - -cc = gcc -m32 - -include $(RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ - -LINK_LIBS = $(cDBUG) - -LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxGcc42/c++ b/wmake/rules/linuxGcc42/c++ deleted file mode 100644 index 32d12ad9de..0000000000 --- a/wmake/rules/linuxGcc42/c++ +++ /dev/null @@ -1,21 +0,0 @@ -.SUFFIXES: .C .cxx .cc .cpp - -c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast - -CC = g++ -m32 - -include $(RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-60 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) diff --git a/wmake/rules/linuxGcc42/c++Debug b/wmake/rules/linuxGcc42/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linuxGcc42/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxGcc42/c++Opt b/wmake/rules/linuxGcc42/c++Opt deleted file mode 100644 index 2aedabd628..0000000000 --- a/wmake/rules/linuxGcc42/c++Opt +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -c++OPT = -O3 diff --git a/wmake/rules/linuxGcc42/c++Prof b/wmake/rules/linuxGcc42/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linuxGcc42/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linuxGcc42/cDebug b/wmake/rules/linuxGcc42/cDebug deleted file mode 100644 index 6c71ed93e8..0000000000 --- a/wmake/rules/linuxGcc42/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -finline-functions diff --git a/wmake/rules/linuxGcc42/cOpt b/wmake/rules/linuxGcc42/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linuxGcc42/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linuxGcc42/cProf b/wmake/rules/linuxGcc42/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linuxGcc42/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linuxGcc42/general b/wmake/rules/linuxGcc42/general deleted file mode 100644 index c300368ee6..0000000000 --- a/wmake/rules/linuxGcc42/general +++ /dev/null @@ -1,10 +0,0 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld -melf_i386 - -PROJECT_LIBS = -l$(WM_PROJECT) -ldl - -include $(GENERAL_RULES)/standard - -include $(RULES)/X -include $(RULES)/c -include $(RULES)/c++ diff --git a/wmake/rules/linuxGcc42/mplib b/wmake/rules/linuxGcc42/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc42/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc42/mplibGAMMA b/wmake/rules/linuxGcc42/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc42/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc42/mplibHPMPI b/wmake/rules/linuxGcc42/mplibHPMPI deleted file mode 100644 index 8aff40632b..0000000000 --- a/wmake/rules/linuxGcc42/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi diff --git a/wmake/rules/linuxGcc42/mplibMPICH b/wmake/rules/linuxGcc42/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc42/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc42/mplibMPICH-GM b/wmake/rules/linuxGcc42/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc42/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc42/mplibOPENMPI b/wmake/rules/linuxGcc42/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxGcc42/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI deleted file mode 120000 index cc63a574c3..0000000000 --- a/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI +++ /dev/null @@ -1 +0,0 @@ -../General/mplibSYSTEMOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc43/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxGcc43/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc43/general +++ b/wmake/rules/linuxGcc43/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc43/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc43/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc43/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc43/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxGcc43/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxGcc43/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxGcc44/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxGcc44/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc44/general +++ b/wmake/rules/linuxGcc44/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib deleted file mode 100644 index 294bd86150..0000000000 --- a/wmake/rules/linuxGcc44/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA deleted file mode 100644 index 11606f2984..0000000000 --- a/wmake/rules/linuxGcc44/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxGcc44/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxGcc44/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxGcc44/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxGcc44/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linuxIA64Gcc/general +++ b/wmake/rules/linuxIA64Gcc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxIA64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxIA64Gcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxIA64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general index 8d72138115..66953a9652 100644 --- a/wmake/rules/linuxIA64Icc/general +++ b/wmake/rules/linuxIA64Icc/general @@ -1,8 +1,4 @@ -CPP = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH -AR = ar -ARFLAGS = cr -RANLIB = ranlib -LD = ld +CPP = cpp -DICC_IA64_PREFETCH GLIBS = -liberty diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxIA64Icc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxIA64Icc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxIA64Icc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxIA64Icc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxIA64Icc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxIA64Icc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxIcc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X new file mode 120000 index 0000000000..73572d6c04 --- /dev/null +++ b/wmake/rules/linuxIcc/X @@ -0,0 +1 @@ +../General/X \ No newline at end of file diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxIcc/general +++ b/wmake/rules/linuxIcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxIcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxIcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH deleted file mode 100644 index e5a38a8e38..0000000000 --- a/wmake/rules/linuxIcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DMPICH_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxIcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxIcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxIcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general index 76d507634a..81927e682b 100644 --- a/wmake/rules/linuxPPC64Gcc/general +++ b/wmake/rules/linuxPPC64Gcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -m elf64ppc PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA deleted file mode 100644 index d62c6250ff..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH deleted file mode 100644 index ac17f7c1d2..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI deleted file mode 100644 index 95ea327379..0000000000 --- a/wmake/rules/linuxPPC64Gcc/mplibQSMPI +++ /dev/null @@ -1,4 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi - diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI new file mode 120000 index 0000000000..d3446c68f1 --- /dev/null +++ b/wmake/rules/linuxPPC64Gcc/mplibQSMPI @@ -0,0 +1 @@ +../General/mplibQSMPI \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general index 6a37beabd4..26658e0c98 100644 --- a/wmake/rules/linuxmingw32/general +++ b/wmake/rules/linuxmingw32/general @@ -1,18 +1,10 @@ -CPP = /lib/cpp $(GFLAGS) LD = mingw32-ld PROJECT_LIBS = -l$(WM_PROJECT) +include $(GENERAL_RULES)/standard + include $(RULES)/X - -include $(GENERAL_RULES)/sourceToDep - -include $(GENERAL_RULES)/flex -include $(GENERAL_RULES)/flex++ -include $(GENERAL_RULES)/byacc -include $(GENERAL_RULES)/btyacc++ -include $(GENERAL_RULES)/moc - include $(RULES)/c include $(RULES)/c++ diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/linuxmingw32/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA deleted file mode 100644 index d62c6250ff..0000000000 --- a/wmake/rules/linuxmingw32/mplibGAMMA +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lgamma diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA new file mode 120000 index 0000000000..4b41692bf6 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibGAMMA @@ -0,0 +1 @@ +../General/mplibGAMMA \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH deleted file mode 100644 index ac17f7c1d2..0000000000 --- a/wmake/rules/linuxmingw32/mplibMPICH +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH new file mode 120000 index 0000000000..c83eb564e1 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibMPICH @@ -0,0 +1 @@ +../General/mplibMPICH \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM deleted file mode 100644 index 88493ebc70..0000000000 --- a/wmake/rules/linuxmingw32/mplibMPICH-GM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM new file mode 120000 index 0000000000..621d0857d3 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibMPICH-GM @@ -0,0 +1 @@ +../General/mplibMPICH-GM \ No newline at end of file diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/linuxmingw32/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/linuxmingw32/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general index 712af78559..c8641ef7e5 100644 --- a/wmake/rules/solarisGcc/general +++ b/wmake/rules/solarisGcc/general @@ -1,4 +1,4 @@ -CPP = /usr/lib/cpp -undef $(GFLAGS) +CPP = /usr/lib/cpp -undef PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib deleted file mode 100644 index 8a84b40146..0000000000 --- a/wmake/rules/solarisGcc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib new file mode 120000 index 0000000000..1fa0d64ec8 --- /dev/null +++ b/wmake/rules/solarisGcc/mplib @@ -0,0 +1 @@ +../General/mplib \ No newline at end of file diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH index cd9ff0e478..c4ef548d9a 100644 --- a/wmake/rules/solarisGcc/mplibMPICH +++ b/wmake/rules/solarisGcc/mplibMPICH @@ -1,3 +1,3 @@ -PFLAGS = +PFLAGS = -DMPICH_SKIP_MPICXX PINC = -I$(MPI_ARCH_PATH)/include PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI deleted file mode 100644 index 834d2d3e22..0000000000 --- a/wmake/rules/solarisGcc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI new file mode 120000 index 0000000000..2d938a16a6 --- /dev/null +++ b/wmake/rules/solarisGcc/mplibOPENMPI @@ -0,0 +1 @@ +../General/mplibOPENMPI \ No newline at end of file diff --git a/wmake/scripts/makeDerivedFiles b/wmake/scripts/makeDerivedFiles index 96377d6832..9d574fe0f9 100755 --- a/wmake/scripts/makeDerivedFiles +++ b/wmake/scripts/makeDerivedFiles @@ -28,7 +28,7 @@ # # Description # Constructs all the file list for make given the source file list, -# written was by hand or using makeFilesAndOptions. +# written by hand or using makeFilesAndOptions. # #------------------------------------------------------------------------------ diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles index 8416970039..14c0921515 100755 --- a/wmake/scripts/makeFiles +++ b/wmake/scripts/makeFiles @@ -35,41 +35,38 @@ if [ -r Make/files ] then - echo "makeFiles: Make/files already exists, exiting" + echo "Error: Make/files already exists - exiting" exit 1 fi -bin=$WM_DIR/bin/$WM_ARCH$WM_COMPILER +dirToString=$WM_DIR/bin/$WM_ARCH$WM_COMPILER/dirToString [ -d Make ] || mkdir Make rm -f Make/files -dirs=`find . -name "*" -type d -print` - -for dir in $dirs +for dir in `find . -type d -print` do - if [ $dir != . ] - then + case "$dir" in + . | ./Make | ./lnInclude ) + # skip special directories + ;; + *) baseDir=`echo $dir | sed 's%^\./%%'` - baseDirName=`echo $baseDir | $bin/dirToString` + baseDirName=`echo $baseDir | $dirToString` - if [ $baseDirName != Make ] - then - echo $baseDirName " = " $baseDir >> Make/files - fi - fi + echo $baseDirName " = " $baseDir >> Make/files + ;; + esac done echo >> Make/files -files=`find . -name "*.[cCylfF]" -type f -print` - -for file in $files +for file in `find . -name "*.[cCylLfF]" -type f -print` do - pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $bin/dirToString` fileName=`echo ${file##*/}` + pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $dirToString` - if [ "$pathName" != "" ] + if [ -n "$pathName" ] then echo '$('$pathName')/'$fileName >> Make/files else diff --git a/wmake/scripts/makeOptions b/wmake/scripts/makeOptions index 609a447ba0..4d813840e0 100755 --- a/wmake/scripts/makeOptions +++ b/wmake/scripts/makeOptions @@ -27,7 +27,7 @@ # makeOptions # # Description -# Scan the current directory for options and construct Make/options +# Construct Make/options # # Usage : makeOptions # @@ -35,8 +35,8 @@ if [ -r Make/options ] then - echo "makeOptions: Make/options already exists, exiting" - exit 1 + echo "Error: Make/options already exists - exiting" + exit 1 fi [ -d Make ] || mkdir Make