diff -Naur OpenFOAM-1.3.CaseInsensitive/changelog.cygwin OpenFOAM-1.3/changelog.cygwin --- OpenFOAM-1.3.CaseInsensitive/changelog.cygwin 2006-04-10 15:41:27.397683200 -0700 +++ OpenFOAM-1.3/changelog.cygwin 2006-04-10 14:57:37.000000000 -0700 @@ -93,3 +93,281 @@ Files in tutorials/ with underscores added: Xoodles/pitzDaily/0/B_ Xoodles/pitzDaily3D/0/B_ + +----------------------------------------------------------------------------- +OpenFOAM-1.3.cygwin-src-0.1 +2006-03-29 Brooks Moses + + wmake/wmakeLnInclude + Modified to accept *.cc and *.hh files. + + Recursive search and replace done on the following patterns (case- + sensitive, whole-word-only): + cloud.C -> cloud_.C + cloud.H -> cloud_.H + DiagTensor.H -> DiagTensor_.H + Dictionary.C -> Dictionary_.C + Dictionary.H -> Dictionary_.H + fvcDDt.C -> fvcDDt_.C + fvcDDt.H -> fvcDDt_.H + ode.C -> ode_.C + ode.H -> ode_.H + PatchToPatchInterpolation.H -> PatchToPatchInterpolation_.H + PointPatchField.C -> PointPatchField_.C + PointPatchField.H -> PointPatchField_.H + PrimitivePatchInterpolation.H -> PrimitivePatchInterpolation_.H + PrimitivePatch.C -> PrimitivePatch_.C + PrimitivePatch.H -> PrimitivePatch_.H + ProcessorTopology.C -> ProcessorTopology_.C + ProcessorTopology.H -> ProcessorTopology_.H + Random.C -> Random_.C + Scalar.C -> Scalar_.C + Scalar.H -> Scalar_.H + SphericalTensor.H -> SphericalTensor_.H + Tensor.H -> Tensor_.H + Vector.H -> Vector_.H + + List.H -> List.hh + HashTable.H -> HashTable.hh + Map.H -> Map.hh + IOmanip.H -> IOmanip.hh + IOstream.H -> IOstream.hh + Istream.H -> Istream.hh + Ostream.H -> Ostream.hh + Time.H -> Time.hh + complex.H -> complex.hh + Pair.H -> Pair.hh + string.H -> string.hh + vector.H -> vector.hh + + Add underscore to fields/PrimitivePatch_ directory reference: + src/Openfoam/Make/files + +----------------------------------------------------------------------------- +OpenFOAM-1.3.cygwin-src-0.2 +2006-03-30 Brooks Moses (BM) based on changes made by Petr Vita (PV) + + .OpenFOAM-1.2/bashrc + Set LOGNAME if unset. (BM) + Added Cygwin options for WM_ARCH and WM_MPLIB. (PV) + + .OpenFOAM-1.2/cshrc + Set LOGNAME if unset. (BM) + Added Cygwin options for WM_ARCH and WM_MPLIB. (BM) + Changed WM_COMPILER to Gcc4 (BM) + + .bashrc + Added Cygwin options for JAVA_HOME. (PV) + Added LD_LIBRARY_PATH to path on Cygwin. (BM) + + .cshrc + Use $shell instead of $SHELL if $SHELL unset. (BM) + Added Cygwin options for JAVA_HOME. (BM) + Added LD_LIBRARY_PATH to path on Cygwin. (BM) + +----------------------------------------------------------------------------- +OpenFOAM-1.3.cygwin-src-0.3 +2006-03-30 Brooks Moses (BM) based on changes made by Petr Vita (PV) + + wmake/makeWmake: + Added code to use Cygwin-specific makefile rules in making wmake. (PV) + + wmake/wclean: + wmake/wcleanAll: + wmake/wcleanAlmostAll: + Remove *.idep files. (PV, BM) + + wmake/wmake: + Added INCLUDE_IMPORT_DEPS to "$make" calls. (PV) + + wmake/wmakeDerivedFiles: + Numerous changes to implement "imported" files. (PV) + + wmake/kshScripts/addCompile: + wmake/cshScripts/addCompile: + Added a --import option to modify the compilation target name. (PV) + + wmake/bashScripts/addCompile: + wmake/tcshScripts/addCompile: + Regenerated via makeWmake (PV) + + wmake/src/wmkdep.l + Added --import option, *.idep files, etc. (PV) + + wmake/src/lex.yy.c + Regenerated from wmkdep.l with Cygwin flex 2.5.4. (PV) + + wmake/rules/General/sourceToDep: + Added .C.idep rule. (PV) + Added .cc.idep, .cpp.idep, .cxx.idep rules. (BM) + + wmake/rules/General/Makefile: + wmake/rules/General/MakefileFiles: + Moved from wmake/ (for use in non-Cygwin targets). (PV) + Fixed "data" -> "date" typo in Makefile. (BM) + + wmake/rules/cygwin/* + wmake/rules/cygwinGcc4/* + Various rule files for Cygwin targets. (PV,BM) + + wmake/Makefile: + wmake/MakefileFiles: + These are now symlinks to the versions in wmake/rules/cygwin (PV) + +----------------------------------------------------------------------------- +OpenFOAM-1.3.cygwin-src-0.4 +2006-03-30 Brooks Moses (BM) based on changes made by Petr Vita (PV) + + applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C + Added #include for cygwin. (PV) + + src/OpenFOAM/db/error/error.C + Wrapped backtrace functionality in #ifndef cygwin. (BM) + + src/meshTools/triSurface/octreeData/octreeDataTriSurface.C + src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C + Added #include "octreeDataTriSurfaceTreeLeaf.H". (PV) + + src/lagrangian/dieselSpray/parcel/parcel.H + Added prototypes for the Cloud I/O functions in parcelIO.C (BM) + + src/lagrangian/dieselSpray/spray/spray.C + Added #include "parcel.H" to include the above templates. (BM) + + src/malloc/fbsdmalloc/fbsdmalloc.c + Removed "madvise" call on cygwin as well as on linux. (BM) + + applications/utilities/mesh/manipulation/Allwmake + Made patchTool/Allwmake conditional on existence of MICO. (PV) + + applications/utilities/miscellaneous/Allwmake + Made foamDebugSwitches conditional on existence of FoamX. (PV) + + applications/utilities/preProcessing/Allwmake + Made FoamX conditional on existence of MICO. (PV) + + src/Allwmake + Compile libOpenFOAM before libPstream on Cygwin (BM) + Compile MICO only on non-Cygwin architecture. (BM) + + src/OpenFOAM/Make/files + Added "(import)" files from the Pstream/dummy directory. (BM) + + src/OpenFOAM/Make/options + Removed linking to -lPstream on Cygwin. (BM) + +----------------------------------------------------------------------------- +OpenFOAM-1.3.cygwin-src-0.5 +2006-03-30 Brooks Moses (BM) based on changes made by Petr Vita (PV) + + src/Pstream/dummy/Make/options + src/lagrangian/basic/Make/options + src/triSurface/Make/options + src/edgeMesh/Make/options + src/meshTools/Make/options + src/finiteVolume/Make/options + src/sampling/Make/options + src/dynamicMesh/Make/options + src/tetDecompositionFiniteElement/Make.cellDecomp/options + src/tetDecompositionFiniteElement/Make.faceDecomp/options + src/tetDecompositionMotionSolver/Make/Options + src/dynamicFvMesh/Make/Options + src/topoChangerFvMesh/Make/Options + src/engine/Make/Options + src/ODE/Make/Options + src/randomProcesses/Make/Options + src/thermophysicalModels/basic/Make/options + src/thermophysicalModels/chemistryModel/Make/options + src/thermophysicalModels/combustion/Make/options + src/thermophysicalModels/laminarFlameSpeed/Make/options + src/thermophysicalModels/liquidMixture/Make/options + src/thermophysicalModels/liquids/Make/options + src/thermophysicalModels/pdfs/Make/options + src/thermophysicalModels/specie/Make/options + src/thermophysicalModels/thermophysicalFunctions/Make/options + src/transportModels/incompressible/Make/options + src/turbulenceModels/compressible/Make/options + src/turbulenceModels/incompressible/Make/options + src/LESmodels/LESdeltas/Make/options + src/LESmodels/LESfilters/Make/options + src/LESmodels/compressible/Make/options + src/LESmodels/incompressible/Make/options + src/lagrangian/dieselSpray/Make/options + src/finiteArea/Make/options + src/errorEstimation/Make/options + Added extra libraries to $(LIB_LIBS) as needed for Cygwin. (PV,BM) + + applications/solvers/basic/potentialFoam/Make/options + applications/solvers/basic/scalarTransportFoam/Make/options + applications/solvers/combustion/coldEngineFoam/Make/options + applications/solvers/combustion/dieselEngineFoam/Make/options + applications/solvers/combustion/dieselFoam/Make/options + applications/solvers/combustion/engineFoam/Make/options + applications/solvers/combustion/reactingFoam/Make/options + applications/solvers/combustion/XiFoam/Make/options + applications/solvers/combustion/Xoodles/Make/options + applications/solvers/compressible/rhopSonicFoam/BCs/Make/options + applications/solvers/compressible/rhopSonicFoam/Make/options + applications/solvers/compressible/rhoSimpleFoam/Make/options + applications/solvers/compressible/rhoSonicFoam/Make/options + applications/solvers/compressible/rhoTurbFoam/Make/options + applications/solvers/compressible/sonicFoam/Make/options + applications/solvers/compressible/sonicFoamAutoMotion/Make/options + applications/solvers/compressible/sonicFoamAutoMotion/Make/options.orig + applications/solvers/compressible/sonicLiquidFoam/Make/options + applications/solvers/compressible/sonicTurbFoam/Make/options + applications/solvers/compressible/sonicTurbFoam/Make/options.orig + applications/solvers/DNSandLES/channelOodles/Make/options + applications/solvers/DNSandLES/coodles/Make/options + applications/solvers/DNSandLES/coodles/Make/options.orig + applications/solvers/DNSandLES/dnsFoam/Make/options + applications/solvers/DNSandLES/oodles/Make/options + applications/solvers/electromagnetics/mhdFoam/Make/options + applications/solvers/heatTransfer/buoyantFoam/Make/options + applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options + applications/solvers/incompressible/boundaryFoam/Make/options + applications/solvers/incompressible/icoDyMFoam/Make/options + applications/solvers/incompressible/icoFoam/Make/options + applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options + applications/solvers/incompressible/simpleFoam/Make/options + applications/solvers/incompressible/turbFoam/Make/options + applications/solvers/multiphase/bubbleFoam/Make/options + applications/solvers/multiphase/interFoam/Make/options + applications/solvers/multiphase/interFoam/interfaceProperties/Make/options + applications/solvers/multiphase/lesInterFoam/Make/options + applications/solvers/multiphase/rasInterFoam/Make/options + applications/solvers/multiphase/settlingFoam/Make/options + applications/solvers/multiphase/twoLiquidMixingFoam/Make/options + applications/solvers/multiphase/twoPhaseEulerFoam/Make/options + applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/Make/options + applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/ + options + applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/Make/ + options + applications/solvers/stressAnalysis/stressedFoam/Make/options + applications/utilities/errorEstimation/icoErrorEstimate/Make/options + applications/utilities/errorEstimation/icoMomentError/Make/options + applications/utilities/errorEstimation/momentScalarError/Make/options + applications/utilities/mesh/advanced/selectCells/Make/options + applications/utilities/mesh/conversion/ccm24ToFoam/ccm24ToFoam/Make/ + options + applications/utilities/mesh/manipulation/checkMesh/Make/options + applications/utilities/mesh/manipulation/couplePatches/Make/options + applications/utilities/mesh/manipulation/flattenMesh/Make/options + applications/utilities/mesh/manipulation/moveEngineMesh/Make/options + applications/utilities/mesh/manipulation/splitMeshRegions/Make/options + applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/ + options + applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C + applications/utilities/postProcessing/miscellaneous/engineCompRatio/Make/ + options + applications/utilities/postProcessing/miscellaneous/sample/Make/options + applications/utilities/postProcessing/miscellaneous/sampleSurface/Make/ + options + applications/utilities/postProcessing/velocityField/Co/Make/options + applications/utilities/postProcessing/velocityField/Pe/Make/options + applications/utilities/preProcessing/boxTurb/Make/options + applications/utilities/preProcessing/mapFields/Make/options + applications/utilities/surface/surfaceMeshTriangulate/Make/options + Added extra libraries to $(EXE_LIBS) or $(LIB_LIBS) as needed for + Cygwin. (PV,BM) diff -Naur OpenFOAM-1.3.CaseInsensitive/.OpenFOAM-1.3/bashrc OpenFOAM-1.3/.OpenFOAM-1.3/bashrc --- OpenFOAM-1.3.CaseInsensitive/.OpenFOAM-1.3/bashrc 2006-03-28 22:57:06.000000000 -0800 +++ OpenFOAM-1.3/.OpenFOAM-1.3/bashrc 2006-04-04 14:56:21.000000000 -0700 @@ -53,6 +53,9 @@ # Location of users FOAM files # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +if [ "$LOGNAME" = "" ]; then + LOGNAME=$USER +fi export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION @@ -146,6 +149,14 @@ #export WM_MPLIB=MPICH export WM_MPLIB=MPI +# Cygwin environment +# ~~~~~~~~~~~~~~~~~~ +elif [ "$machineTest" = "CYGWIN_NT-5.0" -o "$machineTest" = "CYGWIN_NT-5.1" \ + -o "$machineTest" = "CYGWIN_NT-5.2" ]; then + + export WM_ARCH=cygwin + export WM_MPLIB= + # An unsupported operating system # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -Naur OpenFOAM-1.3.CaseInsensitive/.OpenFOAM-1.3/cshrc OpenFOAM-1.3/.OpenFOAM-1.3/cshrc --- OpenFOAM-1.3.CaseInsensitive/.OpenFOAM-1.3/cshrc 2006-03-24 07:47:04.000000000 -0800 +++ OpenFOAM-1.3/.OpenFOAM-1.3/cshrc 2006-04-04 14:56:21.000000000 -0700 @@ -54,12 +54,15 @@ # Location of users FOAM files # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +if (! $?LOGNAME ) then + setenv LOGNAME $USER +endif setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION # Compiler (if set to "" use the system compiler) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -setenv WM_COMPILER Gcc +setenv WM_COMPILER Gcc4 setenv WM_COMPILER_ARCH setenv WM_COMPILER_LIB_ARCH @@ -151,6 +154,14 @@ #setenv WM_MPLIB MPICH setenv WM_MPLIB MPI +# Cygwin environment +# ~~~~~~~~~~~~~~~~~~ +else if ($machineTest == CYGWIN_NT-5.0 || $machineTest == CYGWIN_NT-5.1 \ + || $machineTest == CYGWIN_NT-5.2) then + + setenv WM_ARCH cygwin + setenv WM_MPLIB + # An unsupported operating system # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -Naur OpenFOAM-1.3.CaseInsensitive/.bashrc OpenFOAM-1.3/.bashrc --- OpenFOAM-1.3.CaseInsensitive/.bashrc 2006-03-24 07:46:26.000000000 -0800 +++ OpenFOAM-1.3/.bashrc 2006-04-04 14:56:21.000000000 -0700 @@ -147,6 +147,12 @@ export JAVA_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/j2re1.4.1 +# Cygwin environment +# ~~~~~~~~~~~~~~~~~~ +elif [ `uname -s | sed -e '/CYGWIN*/c\Cygwin'` = "Cygwin" ]; then + + export JAVA_HOME=/cygdrive/c/WINNT/system32 + # An unsupported operating system # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -231,4 +237,10 @@ export MPI_BUFFER_SIZE=20000000 +# In Cygwin, add the library path to the primary path. +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +if [ "$WM_ARCH" = "cygwin" ]; then + export PATH=$LD_LIBRARY_PATH:$PATH +fi + # ----------------------------------------------------------------------------- diff -Naur OpenFOAM-1.3.CaseInsensitive/.cshrc OpenFOAM-1.3/.cshrc --- OpenFOAM-1.3.CaseInsensitive/.cshrc 2006-03-24 07:46:13.000000000 -0800 +++ OpenFOAM-1.3/.cshrc 2006-04-04 14:56:21.000000000 -0700 @@ -51,7 +51,12 @@ setenv WM_LINK_LANGUAGE c++ setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION -set SHELL_VAR=$SHELL +if ($?SHELL) then + set SHELL_VAR=$SHELL +else + set SHELL_VAR=$shell +endif + setenv WM_SHELL $SHELL_VAR:t set path=($WM_DIR $path) @@ -142,6 +147,12 @@ setenv JAVA_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/j2re1.4.1 +# Cygwin environment +# ~~~~~~~~~~~~~~~~~~ +else if (`uname -s | sed -e '/CYGWIN*/c\Cygwin'` == Cygwin) then + + setenv JAVA_HOME /cygdrive/c/WINNT/system32 + # An unsupported operating system # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -226,4 +237,10 @@ setenv MPI_BUFFER_SIZE 20000000 +# In Cygwin, add the library path to the primary path. +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +if ($WM_ARCH == cygwin) then + set path=($LD_LIBRARY_PATH $path) +endif + # -----------------------------------------------------------------------------