Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
amdis
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Aland, Sebastian
amdis
Commits
071d8abc
Commit
071d8abc
authored
Aug 09, 2012
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order of libraries changed
parent
a5d6a23a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
AMDiS/AMDISConfig.cmake.in
AMDiS/AMDISConfig.cmake.in
+5
-1
AMDiS/CMakeLists.txt
AMDiS/CMakeLists.txt
+2
-0
AMDiS/src/DOFVector.h
AMDiS/src/DOFVector.h
+2
-2
AMDiS/src/Functors.h
AMDiS/src/Functors.h
+3
-4
No files found.
AMDiS/AMDISConfig.cmake.in
View file @
071d8abc
...
...
@@ -45,7 +45,7 @@ find_library(_AMDIS_LIB amdis PATHS ${AMDIS_LIBRARY_DIR} ${AMDIS_DIR}/../../lib/
if(_AMDIS_LIB)
get_filename_component(AMDIS_LIBRARY_DIR ${_AMDIS_LIB} PATH CACHE)
set(AMDIS_LIBRARY_DIRS ${AMDIS_LIBRARY_DIR})
set(AMDIS_LIBRARIES "${_AMDIS_LIB};${AMDIS_LIBRARY_DIR}/lib
compositeFEM.so;${AMDIS_LIBRARY_DIR}/libreinit.so;${AMDIS_LIBRARY_DIR}/lib
muparser.so" CACHE STRING "amdis libraries")
set(AMDIS_LIBRARIES "${_AMDIS_LIB};${AMDIS_LIBRARY_DIR}/libmuparser.so" CACHE STRING "amdis libraries")
else()
message(ERROR "could not detect the AMDiS library directory. Please set the variable AMDIS_LIBRARY_DIR to the directory containg the AMDiS library")
endif()
...
...
@@ -181,6 +181,9 @@ list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/reinit)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/compositeFEM)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/muparser)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libcompositeFEM.so)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libreinit.so)
if(${AMDIS_FIND_COMPONENTS} MATCHES umfpack )
if(NOT AMDIS_NEED_UMFPACK)
set(AMDIS_umfpack_FOUND FALSE)
...
...
@@ -199,3 +202,4 @@ if(AMDIS_NEED_ZOLTAN)
message(FATAL_ERROR "Could not find zoltan library!")
endif()
endif()
AMDiS/CMakeLists.txt
View file @
071d8abc
...
...
@@ -397,6 +397,8 @@ if(ENABLE_EXTENSIONS)
if
(
ENABLE_BASE_PROBLEMS
)
SET
(
BASE_PROBLEMS_SRC
${
EXTENSIONS_DIR
}
/base_problems/CahnHilliard.cc
${
EXTENSIONS_DIR
}
/base_problems/CahnHilliard_RB.cc
${
EXTENSIONS_DIR
}
/base_problems/CahnHilliardNavierStokes.cc
# ${EXTENSIONS_DIR}/base_problems/DiffuseDomainFsi.cc
${
EXTENSIONS_DIR
}
/base_problems/LinearElasticity.cc
${
EXTENSIONS_DIR
}
/base_problems/LinearElasticityPhase.cc
...
...
AMDiS/src/DOFVector.h
View file @
071d8abc
...
...
@@ -909,9 +909,9 @@ namespace AMDiS {
template
<
typename
TOut
,
typename
T
>
TOut
integrate
(
const
DOFVector
<
T
>
&
vec
,
AbstractFunction
<
TOut
,
T
>
*
fct
)
AbstractFunction
<
TOut
,
T
>
*
fct
=
NULL
)
{
return
integrate_Vec
(
vec
,
fct
);
return
fct
==
NULL
?
vec
.
Int
()
:
integrate_Vec
(
vec
,
fct
);
}
/** \brief
...
...
AMDiS/src/Functors.h
View file @
071d8abc
...
...
@@ -133,14 +133,14 @@ private:
double
p
;
};
template
<
typename
T1
,
typename
T2
>
struct
Norm2
:
public
AbstractFunction
<
T1
,
T2
>
template
<
typename
T1
,
typename
T2
=
ProductType
<
T1
,
T1
>
>
struct
Norm2
:
public
AbstractFunction
<
T1
,
T2
>
{
T1
operator
()(
const
T2
&
v
)
const
{
return
sqrt
(
v
*
v
);
}
};
template
<
typename
T1
,
typename
T2
>
struct
Norm2Sqr
:
public
AbstractFunction
<
T1
,
T2
>
struct
Norm2Sqr
:
public
AbstractFunction
<
T1
,
T2
>
{
T1
operator
()(
const
T2
&
v
)
const
{
return
v
*
v
;
}
};
...
...
@@ -215,7 +215,6 @@ struct FadeOut : public TertiaryAbstractFunction<double, double, double ,double>
return
dist
*
mean
+
(
1.0
-
dist
)
*
v
;
}
};
}
#endif // AMDIS_FUNCTORS_H
...
...
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