Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Backofen, Rainer
amdis
Commits
d5c8e677
Commit
d5c8e677
authored
Apr 21, 2009
by
Thomas Witkowski
Browse files
Changes for parallelization
parent
b8ed6e7e
Changes
12
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
d5c8e677
...
...
@@ -30,10 +30,10 @@
# the same distribution terms that you use for the rest of that program.
# A sed program that does not truncate output.
SED
=
"/bin/sed"
SED
=
"/
usr/
bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed
=
"/bin/sed -e 1s/^X//"
Xsed
=
"/
usr/
bin/sed -e 1s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
...
...
@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
p2s118
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -66,12 +66,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -82,25 +82,25 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
CC
=
"
g
cc"
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# Is the compiler the GNU C compiler?
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_dir
=
`
gcc
-print-file-name
=
.
|
/usr
/bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
EGREP
=
"grep -E"
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
LN_S
=
"ln -s"
...
...
@@ -174,7 +174,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
...
...
@@ -328,10 +328,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
"
/usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../ /lib/i386-redhat-linux/4.1.2/ /lib/ /usr/lib/i386-redhat-linux/4.1.2/ /usr/lib/
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
`
echo
"
/lib64 /usr/lib64 /usr/local/lib64
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-
2.9.9 /
usr/lib/qt-3.3
/lib "
sys_lib_dlsearch_path_spec
=
"/lib
64
/usr/lib
64
/usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/
2.9.9
9
/
opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -6763,7 +6763,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
p2s118
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -6785,12 +6785,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -6801,25 +6801,25 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
CC
=
"
g++
"
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC
"
# Is the compiler the GNU C compiler?
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_dir
=
`
gcc
-print-file-name
=
.
|
/usr
/bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
EGREP
=
"grep -E"
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
LN_S
=
"ln -s"
...
...
@@ -6893,7 +6893,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
...
...
@@ -6948,11 +6948,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
predep_objects
=
`
echo
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../crti.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtbeginS.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
predep_objects
=
`
echo
"/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/
crti.o /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/crtbeginS.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Dependencies to place after the objects being linked to create a
# shared library.
postdep_objects
=
`
echo
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtendS.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../crtn.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
postdep_objects
=
`
echo
"/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/crtendS.o /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/
crtn.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Dependencies to place before the objects being linked to create a
# shared library.
...
...
@@ -6960,11 +6960,11 @@ predeps=""
# Dependencies to place after the objects being linked to create a
# shared library.
postdeps
=
"-lstdc++ -lm -lgcc_s -lc -lgcc_s"
postdeps
=
"
-lmpi_cxx -lmpi -lopen-rte -lopen-pal -libverbs -lrt -lnuma -ldl -lnsl -lutil -ldl
-lstdc++ -lm -lgcc_s
-lpthread
-lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path
=
`
echo
"-L/usr/lib
/gcc/i386-redhat
-linux/4.1.2 -L/usr/lib/gcc/
i386-redhat
-linux/4.1.2
-L/usr/lib/gcc/i386-redhat
-linux/4.1.2/../../.."
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
compiler_lib_search_path
=
`
echo
"-L/usr/lib
64 -L/licsoft/libraries/openmpi/1.2.6/64bit/lib -L/usr/lib64/gcc/x86_64-suse
-linux/4.1.2 -L/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2
/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib -L/usr/lib64/gcc/x86_64-suse
-linux/4.1.2/../../.."
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
...
...
@@ -7044,10 +7044,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
"
/usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../i386-redhat-linux/4.1.2/ /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../ /lib/i386-redhat-linux/4.1.2/ /lib/ /usr/lib/i386-redhat-linux/4.1.2/ /usr/lib/
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
`
echo
"
/lib64 /usr/lib64 /usr/local/lib64
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-
2.9.9 /
usr/lib/qt-3.3
/lib "
sys_lib_dlsearch_path_spec
=
"/lib
64
/usr/lib
64
/usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/
2.9.9
9
/
opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -7071,7 +7071,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
p2s118
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -7093,12 +7093,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -7109,7 +7109,7 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
...
...
@@ -7118,16 +7118,16 @@ LTCFLAGS="-g -O2"
CC
=
"g77"
# Is the compiler the GNU C compiler?
with_gcc
=
yes
with_gcc
=
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_dir
=
`
gcc
-print-file-name
=
.
|
/usr
/bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
EGREP
=
"grep -E"
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
LN_S
=
"ln -s"
...
...
@@ -7355,10 +7355,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
"
/usr/lib/gcc/i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../i386-redhat-linux/3.4.6/ /usr/lib/gcc/i386-redhat-linux/3.4.6/../../../ /lib/i386-redhat-linux/3.4.6/ /lib/ /usr/lib/i386-redhat-linux/3.4.6/ /usr/lib/
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
`
echo
"
/lib64 /usr/lib64 /usr/local/lib64
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-
2.9.9 /
usr/lib/qt-3.3
/lib "
sys_lib_dlsearch_path_spec
=
"/lib
64
/usr/lib
64
/usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/
2.9.9
9
/
opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
AMDiS/src/CoarseningManager.h
View file @
d5c8e677
...
...
@@ -74,16 +74,6 @@ namespace AMDiS {
*/
inline
Mesh
*
getMesh
()
{
return
mesh
;
};
// /** \brief
// * Coarsens a single Element by decrement its mark and then coarsen
// * the mesh.
// */
// void coarsenElement(Element *element) {
// FUNCNAME("CoarseninManager::coarseElement");
// element->decrementMark();
// coarsenMesh();
// };
/** \brief
* Tries to coarsen every element of mesh at least mark times. First
* all elements are marked for coarsening and then coarsenMesh will
...
...
AMDiS/src/DOFAdmin.h
View file @
d5c8e677
...
...
@@ -62,24 +62,16 @@ namespace AMDiS {
DOFAdmin
();
/** \brief
* constructor
*/
/// Constructor
DOFAdmin
(
Mesh
*
m
);
/** \brief
* constructor
*/
/// Constructor
DOFAdmin
(
Mesh
*
m
,
std
::
string
aName
);
/** \brief
* copy constructor
*/
/// Copy constructor
DOFAdmin
(
const
DOFAdmin
&
);
/** \brief
* destructor
*/
/// Destructor
~
DOFAdmin
();
/** \brief
...
...
@@ -88,19 +80,13 @@ namespace AMDiS {
*/
void
enlargeDOFLists
(
int
minsize
);
/** \brief
* assignment operator
*/
/// assignment operator
DOFAdmin
&
operator
=
(
const
DOFAdmin
&
);
/** \brief
* Compares two DOFAdmins by their names.
*/
/// Compares two DOFAdmins by their names.
bool
operator
==
(
const
DOFAdmin
&
)
const
;
/** \brief
* Compares two DOFAdmins by their names.
*/
/// Compares two DOFAdmins by their names.
inline
bool
operator
!=
(
const
DOFAdmin
&
ad
)
const
{
return
!
(
ad
==*
this
);
}
...
...
@@ -111,19 +97,13 @@ namespace AMDiS {
*/
void
addDOFIndexed
(
DOFIndexedBase
*
dofIndexed
);
/** \brief
* Adds a DOFContainer object to the DOFAdmin.
*/
/// Adds a DOFContainer object to the DOFAdmin.
void
addDOFContainer
(
DOFContainer
*
dofContainer
);
/** \brief
* Removes the given DOFIndexedBase object from DOFAdmin.
*/
/// Removes the given DOFIndexedBase object from DOFAdmin.
void
removeDOFIndexed
(
DOFIndexedBase
*
dofIndexed
);
/** \brief
* Removes the given DOFContainer object from DOFAdmin.
*/
/// Removes the given DOFContainer object from DOFAdmin.
void
removeDOFContainer
(
DOFContainer
*
dofContainer
);
/** \brief
...
...
@@ -135,16 +115,12 @@ namespace AMDiS {
*/
void
compress
(
std
::
vector
<
DegreeOfFreedom
>
&
new_dof
);
/** \brief
* Returns an iterator to the begin of \ref dofIndexedList
*/
/// Returns an iterator to the begin of \ref dofIndexedList
std
::
list
<
DOFIndexedBase
*>::
iterator
beginDOFIndexed
()
{
return
dofIndexedList
.
begin
();
}
/** \brief
* Returns an iterator to the end of \ref dofIndexedList
*/
/// Returns an iterator to the end of \ref dofIndexedList
std
::
list
<
DOFIndexedBase
*>::
iterator
endDOFIndexed
()
{
return
dofIndexedList
.
end
();
}
...
...
@@ -153,87 +129,62 @@ namespace AMDiS {
* \{
*/
/** \brief
* Returns \ref sizeUsed.
*/
/// Returns \ref sizeUsed.
inline
const
int
getUsedSize
()
const
{
return
sizeUsed
;
}
/** \brief
* Returns \ref size
*/
/// Returns \ref size
inline
const
int
getSize
()
const
{
return
size
;
}
/** \brief
* Returns \ref usedCount
*/
/// Returns \ref usedCount
inline
const
int
getUsedDOFs
()
const
{
return
usedCount
;
}
/** \brief
* Returns \ref holeCount
*/
/// Returns \ref holeCount
inline
const
int
getHoleCount
()
const
{
return
holeCount
;
}
/** \brief
* Returns \ref name
*/
/// Returns \ref name
inline
const
std
::
string
&
getName
()
const
{
return
name
;
}
/** \brief
* Returns \ref nrDOF[i], i.e., the number of dofs for the
* position i.
*/
/// Returns \ref nrDOF[i], i.e., the number of dofs for the position i.
inline
const
int
getNumberOfDOFs
(
int
i
)
const
{
return
nrDOF
[
i
];
}
/** \brief
* Returns \ref nrDOF
*/
/// Returns \ref nrDOF
inline
const
DimVec
<
int
>&
getNumberOfDOFs
()
const
{
return
nrDOF
;
}
/** \brief
* Returns \ref nr0DOF[i]
*/
/// Returns \ref nr0DOF[i]
inline
const
int
getNumberOfPreDOFs
(
int
i
)
const
{
return
nr0DOF
[
i
];
}
/** \brief
* Returns \ref nr0DOF
*/
/// Returns \ref nr0DOF
inline
const
DimVec
<
int
>&
getNumberOfPreDOFs
()
const
{
return
nr0DOF
;
}
/** \brief
* Returns \ref mesh
*/
/// Returns \ref mesh
inline
const
Mesh
*
getMesh
()
const
{
return
mesh
;
}
/** \brief
* Returns \ref dofFree, the array denoting DOFs to be either free or used.
*/
/// Returns \ref dofFree, the array denoting DOFs to be either free or used.
inline
const
std
::
vector
<
bool
>&
getDOFFree
()
const
{
return
dofFree
;
}
/** \brief
* Returns if the given DOF is free.
*/
/// Returns if the given DOF is free.
inline
const
bool
isDOFFree
(
int
i
)
const
{
return
dofFree
[
i
];
}
...
...
@@ -244,26 +195,18 @@ namespace AMDiS {
* \{
*/
/** \brief
* Sets \ref nrDOF[i] = v
*/
/// Sets \ref nrDOF[i] = v
void
setNumberOfDOFs
(
int
i
,
int
v
);
/** \brief
* Sets \ref nr0DOF[i] = v
*/
/// Sets \ref nr0DOF[i] = v
void
setNumberOfPreDOFs
(
int
i
,
int
v
);
/** \brief
* Sets \ref name = n
*/
/// Sets \ref name = n
inline
void
setName
(
const
std
::
string
&
n
)
{
name
=
n
;
}
/** \brief
* Sets \ref mesh = m
*/
/// Sets \ref mesh = m
inline
void
setMesh
(
Mesh
*
m
)
{
mesh
=
m
;
}
...
...
@@ -273,9 +216,7 @@ namespace AMDiS {
/** \} */
protected:
/** \brief
* initializes this DOFAdmin
*/
/// Initializes this DOFAdmin
void
init
();
/** \brief
...
...
@@ -284,9 +225,7 @@ namespace AMDiS {
*/
int
getDOFIndex
();
/** \brief
* Frees index dof. Used by Mesh::getDOF()
*/
/// Frees index dof. Used by Mesh::getDOF()
void
freeDOFIndex
(
int
dof
);
///
...
...
@@ -296,70 +235,46 @@ namespace AMDiS {
void
deserialize
(
std
::
istream
&
in
);
protected:
/** \brief
* name of this DOFAdmin
*/
/// name of this DOFAdmin
std
::
string
name
;
/** \brief
* the mesh this DOFAdmin belongs to
*/
/// the mesh this DOFAdmin belongs to
Mesh
*
mesh
;
/** \brief
* the dofFree vector stores for each index whether it is used or not
*/
/// The dofFree vector stores for each index whether it is used or not
std
::
vector
<
bool
>
dofFree
;
/** \brief
* index of the first free value in \ref dofFree
*/
/// index of the first free value in \ref dofFree
int
firstHole
;
/** \brief
* allocated size of managed vectors and matrices
*/
/// allocated size of managed vectors and matrices
int
size
;
/** \brief
* number of used dof indices
*/
/// number of used dof indices
int
usedCount
;
/** \brief
* number of FREED dof indices (NOT size-sizeUsed)
*/
/// number of FREED dof indices (NOT size-sizeUsed)
int
holeCount
;
/** \brief
* > max. index of a used entry
*/
/// > max. index of a used entry
int
sizeUsed
;
/** \brief
* Number of dofs for each position, i.e., vertex,
*
edge, ..., center,
for this DOFAdmin.
* Number of dofs for each position, i.e., vertex,
edge, ..., center,
* for this DOFAdmin.
*/
DimVec
<
int
>
nrDOF
;
/** \brief
* dofs from previous DOFAdmins
*/
/// Dofs from previous DOFAdmins
DimVec
<
int
>
nr0DOF
;
/** \brief
* list of all managed DOFIndexed objects.
*/
/// List of all managed DOFIndexed objects.
std
::
list
<
DOFIndexedBase
*>
dofIndexedList
;
/** \brief
* list of all managed DOFContainer objects
*/
/// List of all managed DOFContainer objects
std
::
list
<
DOFContainer
*>
dofContainerList
;
/** \brief
* size increment used by \ref enlargeDOFLists.
*/
/// Size increment used by \ref enlargeDOFLists.
static
const
int
sizeIncrement
;
friend
class
DOFIteratorBase
;
...
...
AMDiS/src/ElementFileWriter.cc
View file @
d5c8e677
...
...
@@ -107,7 +107,7 @@ namespace AMDiS {
FUNCNAME
(
"ElementFileWriter::writeTecPlotValues()"
);
std
::
ofstream
fout
(
filename
.
c_str
());
TEST_EXIT
(
fout
)(
"Could not open file %s !
\n
"
,
filename
);
TEST_EXIT
(
fout
)(
"Could not open file %s !
\n
"
,
filename
.
c_str
()
);
fout
.
setf
(
std
::
ios
::
scientific
,
std
::
ios
::
floatfield
);
int
dim
=
mesh
->
getDim
();
...
...
@@ -187,7 +187,7 @@ namespace AMDiS {
FUNCNAME
(
"ElementFileWriter::writeMeshDatValues()"
);
std
::
ofstream
fout
(
filename
.
c_str
());
TEST_EXIT
(
fout
)(
"Could not open file %s !
\n
"
,
filename
);
TEST_EXIT
(
fout
)(
"Could not open file %s !
\n
"
,
filename
.
c_str
()
);
int
dim
=
mesh
->
getDim
();
double
val
;
...
...
@@ -286,7 +286,7 @@ namespace AMDiS {
FUNCNAME
(
"ElementFileWriter::writeVtkValues()"
);
std
::
ofstream
fout
(
filename
.
c_str
());
TEST_EXIT
(
fout
)(
"Could not open file %s !
\n
"
,
filename
);
TEST_EXIT
(
fout
)(
"Could not open file %s !
\n
"
,
filename
.
c_str
()
);
int
dim
=
mesh
->
getDim
();
int
vertices
=
mesh
->
getGeo
(
VERTEX
);
...
...
AMDiS/src/MacroReader.cc
View file @
d5c8e677
...
...
@@ -1870,10 +1870,8 @@ namespace AMDiS {
fill_flag
|=
Mesh
::
FILL_NEIGH
;
for
(
mesh
->
iadmin
=
0
;
mesh
->
iadmin
<
static_cast
<
int
>
(
mesh
->
admin
.
size
());
mesh
->
iadmin
++
)
{
localAdmin
=
mesh
->
admin
[
mesh
->
iadmin
];
for
(
int
iadmin
=
0
;
iadmin
<
static_cast
<
int
>
(
mesh
->
admin
.
size
());
iadmin
++
)
{
localAdmin
=
mesh
->
admin
[
iadmin
];
if
(
localAdmin
->
getSize
()
>
0
)
{
if
(
static_cast
<
int
>
(
mesh
->
dof_used
.
size
())
<
localAdmin
->
getSize
())
{
...
...
@@ -1883,38 +1881,40 @@ namespace AMDiS {
mesh
->
dof_used
[
i
]
=
0
;
nused
=
nfree
=
0
;
TraverseStack
stack
;
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
mesh
,
-
1
,
fill_flag
|
Mesh
::
FILL_ADD_ALL
);