Commit e3d28272 authored by mattijs's avatar mattijs
Browse files

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

parents 1a3a57f7 85f5fb73
......@@ -151,7 +151,7 @@ public:
inline string(const char c);
//- Construct from copies of a single character
inline string(const size_type, const char);
inline string(const size_type len, const char c);
//- Construct from Istream
string(Istream& is);
......@@ -267,19 +267,6 @@ public:
// \return True when strings match literally.
inline bool operator()(const std::string& text) const;
//- Return sub-string from the i-th character for \a n characters
inline string operator()
(
const size_type i,
const size_type n
) const;
//- Return sub-string from the first character for \a n characters
inline string operator()
(
const size_type n
) const;
// IOstream Operators
......
......@@ -243,22 +243,6 @@ inline bool Foam::string::operator()(const std::string& text) const
}
inline Foam::string Foam::string::operator()
(
const size_type i,
const size_type n
) const
{
return substr(i, n);
}
inline Foam::string Foam::string::operator()(const size_type n) const
{
return substr(0, n);
}
inline unsigned Foam::string::hash::operator()
(
const string& str,
......
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
#------------------------------------------------------------------------------
......@@ -6,9 +6,11 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh
application=$(getApplication)
#- Test writing collated format
runApplication decomposePar -fileHandler collated
runParallel `getApplication` -fileHandler collated
runParallel $application -fileHandler collated
runApplication reconstructPar -latestTime -fileHandler collated
#- Delete collated files
......@@ -16,10 +18,10 @@ rm -rf processors
#- Test writing uncollated format
runApplication -s uncollated decomposePar -fileHandler uncollated
runParallel -s uncollated `getApplication` -fileHandler uncollated
runParallel -s uncollated $application -fileHandler uncollated
#- Restart from uncollated
runParallel -s collated `getApplication` -fileHandler collated
runParallel -s collated $application -fileHandler collated
runApplication -s collated reconstructPar -latestTime -fileHandler collated
#- Convert the parallel format to uncollated
......
......@@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=`getApplication`
# Application name
application=$(getApplication)
rm -f 0/T
cp 0/T.orig 0/T
......
......@@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=`getApplication`
# Application name
application=$(getApplication)
rm -f 0
cp -r 0.orig 0
......
......@@ -20,7 +20,7 @@ runApplication $(getApplication)
# foamDictionary "$f" > "../processors/0/$f"; done \
#)
#
#runParallel `getApplication` -fileHandler collated
#runParallel $(getApplication) -fileHandler collated
#runApplication reconstructParMesh -constant -mergeTol 1e-6
#runApplication reconstructPar
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/cabin";
location "0/cabin";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volVectorField;
location "0.0001/cabin";
location "0/cabin";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/cabin";
location "0/cabin";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/cabin";
location "0/cabin";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/cabin";
location "0/cabin";
object mut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/cabin";
location "0/cabin";
object omega;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/cabin";
location "0/cabin";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/cabin";
location "0/cabin";
object p_rgh;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/exterior";
location "0/exterior";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volVectorField;
location "0.0001/exterior";
location "0/exterior";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/exterior";
location "0/exterior";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/exterior";
location "0/exterior";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format binary;
class volScalarField;
location "0.0001/exterior";
location "0/exterior";
object omega;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment