Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
ce66c746
Commit
ce66c746
authored
Feb 14, 2017
by
Julian Marcon
Browse files
Tidy.
parent
90868941
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
ce66c746
...
...
@@ -84,7 +84,7 @@ v4.4.0
-
2D to 3D mesh extrusion module (!715)
-
Add new two-dimensional mesher from NACA code or step file (!720)
-
Fix inverted boundary layer in 2D (!736)
-
More sensible element sizing with bou
d
nary layers in 2D (!736)
-
More sensible element sizing with boun
d
ary layers in 2D (!736)
-
Change variable names in mcf file to make more sense (!736)
-
Fix issues in varopti module so that in can be compiled without meshgen on
(!736)
...
...
library/LibUtilities/BasicUtils/Thread.h
View file @
ce66c746
...
...
@@ -100,19 +100,19 @@ class ThreadJob
{
public:
/// Base constructor
LIB_UTILITIES_EXPORT
ThreadJob
();
LIB_UTILITIES_EXPORT
ThreadJob
();
/// Base destructor.
LIB_UTILITIES_EXPORT
virtual
~
ThreadJob
();
LIB_UTILITIES_EXPORT
virtual
~
ThreadJob
();
/**
* This method will be called when the task is loaded
* onto a worker thread and is ready to run. When Run
* has finished this instance will be destructed.
*/
LIB_UTILITIES_EXPORT
virtual
void
Run
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
Run
()
=
0
;
/// Set number of worker threads.
LIB_UTILITIES_EXPORT
void
SetWorkerNum
(
unsigned
int
num
);
LIB_UTILITIES_EXPORT
void
SetWorkerNum
(
unsigned
int
num
);
protected:
/**
...
...
@@ -168,7 +168,7 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
{
public:
/// Destructor.
LIB_UTILITIES_EXPORT
virtual
~
ThreadManager
();
LIB_UTILITIES_EXPORT
virtual
~
ThreadManager
();
/**
* @brief Pass a list of tasklets to the master queue.
* @param joblist Vector of ThreadJob pointers.
...
...
@@ -181,7 +181,7 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
*
* @see SchedType
*/
LIB_UTILITIES_EXPORT
virtual
void
QueueJobs
(
std
::
vector
<
ThreadJob
*>&
joblist
)
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
QueueJobs
(
std
::
vector
<
ThreadJob
*>&
joblist
)
=
0
;
/**
* @brief Pass a single job to the master queue.
* @param job A pointer to a ThreadJob subclass.
...
...
@@ -190,14 +190,14 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
* issue then suspend the workers with SetNumWorkers(0) until the jobs
* are queued.
*/
LIB_UTILITIES_EXPORT
virtual
void
QueueJob
(
ThreadJob
*
job
)
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
QueueJob
(
ThreadJob
*
job
)
=
0
;
/**
* @brief Return the number of active workers.
*
* Active workers are threads that are either running jobs
* or are waiting for jobs to be queued.
*/
LIB_UTILITIES_EXPORT
virtual
unsigned
int
GetNumWorkers
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
unsigned
int
GetNumWorkers
()
=
0
;
/**
* @brief Returns the worker number of the executing thread.
*
...
...
@@ -216,7 +216,7 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
*
* Returns 0 if called by non-thread.
*/
LIB_UTILITIES_EXPORT
virtual
unsigned
int
GetWorkerNum
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
unsigned
int
GetWorkerNum
()
=
0
;
/**
* @brief Sets the number of active workers.
* @param num The number of active workers.
...
...
@@ -227,18 +227,18 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
* If num is greater than the maximum allowed number of active workers,
* then the maximum value will be used instead.
*/
LIB_UTILITIES_EXPORT
virtual
void
SetNumWorkers
(
const
unsigned
int
num
)
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
SetNumWorkers
(
const
unsigned
int
num
)
=
0
;
/**
* @brief Sets the number of active workers to the maximum.
*
* Sets the number of active workers to the maximum available.
*/
LIB_UTILITIES_EXPORT
virtual
void
SetNumWorkers
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
SetNumWorkers
()
=
0
;
/**
* @brief Gets the maximum available number of threads.
* @return The maximum number of workers.
*/
LIB_UTILITIES_EXPORT
virtual
unsigned
int
GetMaxNumWorkers
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
unsigned
int
GetMaxNumWorkers
()
=
0
;
/**
* @brief Waits until all queued jobs are finished.
*
...
...
@@ -261,7 +261,7 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
* number of worker threads, implementations should increase the number
* of active workers by 1 on entering Wait().
*/
LIB_UTILITIES_EXPORT
virtual
void
Wait
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
Wait
()
=
0
;
/**
* @brief Controls how many jobs are sent to each worker at a time.
*
...
...
@@ -271,17 +271,17 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
* @see SchedType
* @see SetSchedType()
*/
LIB_UTILITIES_EXPORT
virtual
void
SetChunkSize
(
unsigned
int
chnk
)
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
SetChunkSize
(
unsigned
int
chnk
)
=
0
;
/**
* @brief Sets the current scheduling algorithm.
* @see SetChunkSize()
*/
LIB_UTILITIES_EXPORT
virtual
void
SetSchedType
(
SchedType
s
)
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
SetSchedType
(
SchedType
s
)
=
0
;
/**
* @brief Indicates whether the code is in a worker thread or not.
* @return True if the caller is in a worker thread.
*/
LIB_UTILITIES_EXPORT
virtual
bool
InThread
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
bool
InThread
()
=
0
;
/**
* @brief A calling threads holds until all active threads call this
* method.
...
...
@@ -294,16 +294,16 @@ class ThreadManager : public boost::enable_shared_from_this<ThreadManager>
* is altered after a thread has called this method. It is only safe to
* call SetNumWorkers() when no threads are holding.
*/
LIB_UTILITIES_EXPORT
virtual
void
Hold
()
=
0
;
LIB_UTILITIES_EXPORT
virtual
void
Hold
()
=
0
;
/**
* @brief Returns a description of the type of threading.
*
* E.g. "Threading with Boost"
*/
LIB_UTILITIES_EXPORT
virtual
const
std
::
string
&
GetType
()
const
=
0
;
LIB_UTILITIES_EXPORT
virtual
const
std
::
string
&
GetType
()
const
=
0
;
/// ThreadManager implementation.
LIB_UTILITIES_EXPORT
virtual
bool
IsInitialised
();
LIB_UTILITIES_EXPORT
virtual
bool
IsInitialised
();
inline
int
GetThrFromPartition
(
int
pPartition
)
{
...
...
@@ -354,17 +354,17 @@ class ThreadMaster
THREADMANAGER_MAX
};
/// Constructor
LIB_UTILITIES_EXPORT
ThreadMaster
();
LIB_UTILITIES_EXPORT
ThreadMaster
();
/// Destructor
LIB_UTILITIES_EXPORT
~
ThreadMaster
();
LIB_UTILITIES_EXPORT
~
ThreadMaster
();
/// Sets what ThreadManagers will be created in CreateInstance.
LIB_UTILITIES_EXPORT
void
SetThreadingType
(
const
std
::
string
&
p_type
);
LIB_UTILITIES_EXPORT
void
SetThreadingType
(
const
std
::
string
&
p_type
);
/// Gets the ThreadManager associated with string s.
LIB_UTILITIES_EXPORT
ThreadManagerSharedPtr
&
GetInstance
(
const
ThreadManagerName
t
);
LIB_UTILITIES_EXPORT
ThreadManagerSharedPtr
&
GetInstance
(
const
ThreadManagerName
t
);
/// Creates an instance of a ThreadManager (which one is determined by
/// a previous call to SetThreadingType) and associates it with
/// the string s.
LIB_UTILITIES_EXPORT
ThreadManagerSharedPtr
CreateInstance
(
const
ThreadManagerName
t
,
LIB_UTILITIES_EXPORT
ThreadManagerSharedPtr
CreateInstance
(
const
ThreadManagerName
t
,
unsigned
int
nThr
);
};
...
...
library/NekMeshUtils/MeshElements/Face.cpp
View file @
ce66c746
...
...
@@ -56,7 +56,7 @@ void Face::GetCurvedNodes(
int
n2
=
m_edgeList
[
1
]
->
GetNodeCount
();
int
n3
=
m_edgeList
[
2
]
->
GetNodeCount
();
bool
same
=
(
n
==
n2
?
(
n2
==
n3
)
:
false
);
bool
same
=
(
n
==
n2
?
(
n2
==
n3
)
:
false
);
ASSERTL0
(
same
,
"Edges are not consistent"
);
nodeList
.
insert
(
...
...
library/NekMeshUtils/MeshElements/Node.h
View file @
ce66c746
...
...
@@ -227,7 +227,7 @@ public:
return
an
;
}
// fu
c
ntions for cad information
// fun
c
tions for cad information
void
SetCADCurve
(
int
i
,
CADCurveSharedPtr
c
,
NekDouble
t
)
{
...
...
library/NekMeshUtils/Octree/Octree.cpp
View file @
ce66c746
...
...
@@ -103,7 +103,7 @@ void Octree::Process()
NekDouble
Octree
::
QueryR
(
Array
<
OneD
,
NekDouble
>
loc
)
{
NekDouble
d
=
Query
(
loc
);
return
d
/
2.0
/
(
sqrt
(
m_eps
*
(
2.0
-
m_eps
)));
return
d
/
2.0
/
(
sqrt
(
m_eps
*
(
2.0
-
m_eps
)));
}
NekDouble
Octree
::
Query
(
Array
<
OneD
,
NekDouble
>
loc
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment