diff --git a/doc/changes/codeStream.org b/doc/changes/codeStream.org index bcef4c166bb5803cabb1d1ccd8828b2d0d4aa859..6e26ba981015a7b292ba94bc4a4e6440b34a78b8 100644 --- a/doc/changes/codeStream.org +++ b/doc/changes/codeStream.org @@ -49,13 +49,14 @@ - it copies a template file =($FOAM_CODESTREAM_TEMPLATES/codeStreamTemplate.C)=, substituting all occurences of =code=, =codeInclude=, =codeOptions=. - - it writes library source files to =constant/codeStream/<sha1>= and compiles + - it writes library source files to =codeStream/<SHA1>= and compiles it using =wmake libso=. - - the resulting library gets loaded (=dlopen=, =dlsym=) and the function - executed + - the resulting library is generated under + =codeStream/platforms/$WM_OPTIONS/lib= and is loaded (=dlopen=, =dlsym=) + and the function executed - the function will have written its output into the Ostream which then gets used to construct the entry to replace the whole =#codeStream= section. - - using the sha1 means that same code will only be compiled and loaded once. + - using the SHA1 means that same code will only be compiled and loaded once. * Boundary condition: =codedFixedValue= This uses the code from codeStream to have an in-line specialised diff --git a/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.C b/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.C index d0cd0b683087a29b5a01d6a364f67a9a48670b04..1eaa2a4e9da3ac4d7a7ceeafa776ace00d58cf95 100644 --- a/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.C +++ b/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.C @@ -49,18 +49,6 @@ const Foam::fileName Foam::codeStreamTools::codeTemplateDirName // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // -Foam::fileName Foam::codeStreamTools::baseDir() -{ - return stringOps::expand("$FOAM_CASE/codeStream"); -} - - -Foam::fileName Foam::codeStreamTools::libSubDir() -{ - return stringOps::expand("platforms/$WM_OPTIONS/lib"); -} - - Foam::fileName Foam::codeStreamTools::codePath(const word& subDirName) { return stringOps::expand("$FOAM_CASE/codeStream/" + subDirName); diff --git a/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.H b/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.H index 4f158b6aeae13bc52badb749f3d5d179a38da00d..460eb7e0fc09ef339cf3052211ad437c73e8f190 100644 --- a/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.H +++ b/src/OpenFOAM/db/dynamicLibrary/codeStream/codeStreamTools.H @@ -145,14 +145,6 @@ public: // Member functions - //- Directory for compile/link (case-specific) - // Expanded from \$FOAM_CASE/codeStream - static fileName baseDir(); - - //- Subdirectory name for library - // Expanded from platforms/\$WM_OPTIONS/lib - static fileName libSubDir(); - //- Local path for specified code name // Expanded from \$FOAM_CASE/codeStream static fileName codePath(const word& subDirName);