Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
6c8f8e2
Add the proper flags for the examples.
l-korous Feb 7, 2014
0480d07
Few rewrites.
l-korous Feb 7, 2014
427637b
Add some parameters to Mixins::Loggable.
l-korous Feb 7, 2014
e1357cf
Fix the static data initialization order problem.
l-korous Feb 7, 2014
ee510f2
Double assembling with switched matrix problem fix.
l-korous Feb 7, 2014
1a2b678
Comment and clean Linearizer code.
l-korous Feb 7, 2014
7ca2c06
Fix Loggable mixin.
l-korous Feb 7, 2014
9df177b
Remove the ResidualNormRelativeToInitial strategy.
l-korous Feb 7, 2014
860d10e
Fix Orderizer simple quadrature & Orderizer code using it.
l-korous Feb 17, 2014
4ba500b
Unify the default parameter value in OrderView::show.
l-korous Feb 17, 2014
94b49d9
Debugging the problem of new devel in Agros.
l-korous Feb 5, 2014
9f0c5a3
Proposed optimization of curved elements.
l-korous Feb 19, 2014
dc904a4
Fixes in VectorView & examples etc.
l-korous Feb 20, 2014
58f37bd
Fix Geom<Ord> issues.
l-korous Feb 5, 2014
110f3af
Loads of optimizations.
l-korous Feb 20, 2014
aed9d93
Fix memory leak in DG.
l-korous Feb 20, 2014
3b3ec58
Gcc fixes.
l-korous Feb 22, 2014
7af4241
Work on DiscreteProblem optimizations.
l-korous Feb 22, 2014
9240e54
Gcc fixes.
l-korous Feb 22, 2014
c1513b6
Fix in an example.
l-korous Feb 22, 2014
be277d3
Addition to SelectiveAssembler.
l-korous Feb 22, 2014
5d9b170
Fix the problem in selective assembler.
l-korous Feb 22, 2014
27fe723
Fix MSVC2010 issue.
l-korous Feb 22, 2014
c63160c
Fix for Agros.
l-korous Feb 22, 2014
9968ac9
cd ..Merge branch 'devel' of github.com:hpfem/hermes
l-korous Feb 24, 2014
aed434f
Add more debugging to mesh - THIS MAKES XML MESH LOADING SLOW - TAKE …
l-korous Feb 25, 2014
dbaba34
Add some debugging and more exceptions throws to XML mesh loading.
l-korous Feb 27, 2014
e7e7688
Remove the checks for wrong syntax in vertex coordinates in xml h2d m…
l-korous Feb 27, 2014
27e0e64
Fix memory leaks.
l-korous Feb 27, 2014
16b90f6
Minor refactors for Space copying in Adaptivity.
l-korous Feb 27, 2014
5ae7ac0
Add the adaptivity-matrix-reuse test example.
l-korous Feb 28, 2014
9490f72
Add some simplifying typedefs, new AdaptSolver class (not used so far…
l-korous Feb 28, 2014
8b96769
Fix the remaining WeakForm passing.
l-korous Feb 28, 2014
e5cee47
Remove Hermes::vector (and use std::vector instead).
l-korous Feb 28, 2014
a74d8c1
Somw more new typedefs usage.
l-korous Feb 28, 2014
0524488
Add AdaptSolver basis.
l-korous Feb 28, 2014
658ed06
Work on the AdaptSolver class.
l-korous Mar 3, 2014
6b952dd
Work on precalculated tables - proof of concept.
l-korous Mar 6, 2014
51e8cdb
More work on AdaptSolver class. Beginning of matrix reuse data struct…
l-korous Mar 3, 2014
e3ef17c
Make use of RefinementType enum.
l-korous Mar 4, 2014
56743b5
Progress on Adaptivity.
l-korous Mar 4, 2014
32f9f2d
Adding DOFs to reassemble etc.
l-korous Mar 6, 2014
348f296
Massive progress.
l-korous Mar 6, 2014
8987d9f
Progress on adaptivity, data types, etc.
l-korous Mar 7, 2014
00548ae
Re-using in Adaptivity works, time to optimize.
l-korous Mar 7, 2014
dc8a48b
Progress on adaptivity.
l-korous Mar 11, 2014
b21a504
Add a lot of outputs and do some testing.
l-korous Mar 11, 2014
84f0a2c
Work on adaptivity -> reusal change from element-based to DOF-based.
l-korous Mar 12, 2014
b46b65a
Optimizing AdaptSolver & related.
l-korous Mar 13, 2014
7848962
A few optimizations of data types, adapt-reuse example.
l-korous Mar 13, 2014
0e92e7a
An attempt to fix outputting of vertex coordinates in H2D XML format.
l-korous Mar 13, 2014
bb4857a
Progress on Adaptivity - already first time savings on a single equat…
l-korous Mar 19, 2014
50fd9bc
Add an adaptivity - reuse exmample with a system of equations.
l-korous Mar 19, 2014
27d8aef
Progress on optimizations.
l-korous Mar 20, 2014
7c476f3
Progress.
l-korous Mar 20, 2014
49f4405
Further progress. The only optimization left is the matrix copying.
l-korous Mar 20, 2014
f18c784
Ongoing progress - split Geom to GeomVol & GeomSurf, take out some ne…
l-korous Mar 21, 2014
9161c9e
Add GeomBasic - for Agros's ext functions.
l-korous Mar 21, 2014
0f8cb0d
Finish Geom optimizations, fix AdaptSolver for combination of constra…
l-korous Mar 21, 2014
07c26c8
Add layer-interior example.
l-korous Mar 21, 2014
5b03cbe
Work on the examples.
l-korous Mar 23, 2014
5c0d155
Debugging & optimizing adaptivity code.
l-korous Mar 24, 2014
5d976b0
Debugging Newton usage in adaptivity reuse scheme.
l-korous Mar 24, 2014
6a5fa63
Fix Redmine issue http://faraday.fel.zcu.cz/redmine/issues/237
l-korous May 12, 2014
d749c6a
Working on Agros's writeToHermes.
l-korous Mar 14, 2014
6a32f12
A fix for Agros.
l-korous Mar 18, 2014
1c75074
Reviewing verbose_output usage.
l-korous Mar 18, 2014
6562b56
Fix the u_ext_fn initialization for Agros.
l-korous Mar 24, 2014
f2c12c2
clang fixes
karban Apr 10, 2014
3270f2a
Fix the Space::copy issue.
l-korous Apr 17, 2014
f9e5ef3
Make buildbot build.
l-korous Apr 17, 2014
8e350d8
A fix in the code.
l-korous Apr 17, 2014
c4e03b4
Add more debugging to mesh - THIS MAKES XML MESH LOADING SLOW - TAKE …
l-korous Feb 25, 2014
e7108a8
Add some debugging and more exceptions throws to XML mesh loading.
l-korous Feb 27, 2014
b65b4b8
Remove the checks for wrong syntax in vertex coordinates in xml h2d m…
l-korous Feb 27, 2014
ee23303
Fix for noglut.
l-korous Apr 18, 2014
a7aa899
Fix a typo in CMake.
l-korous Apr 18, 2014
9e9b4ce
A probable fix of XSD cmake problems.
l-korous Apr 18, 2014
7c974ac
Fix the libiberty issue.
l-korous Apr 18, 2014
32053fe
Fixing libiberty.
l-korous Apr 18, 2014
c7baff1
Handle BFD.
l-korous Apr 18, 2014
4867c6e
Make buildbot build.
l-korous Apr 20, 2014
edd0932
Make buildbot build
l-korous Apr 21, 2014
9f2f4a1
Make Trilinos linear solvers work again.
l-korous Apr 22, 2014
00167c3
Fix looking for MPI headers in MUMPS directories.
l-korous Apr 24, 2014
bba4b12
Fix test subdomains-1.
l-korous May 11, 2014
c18c204
Make devel build and start testing.
l-korous May 12, 2014
b6b99df
Add exceptions forward declarations to common.h.
l-korous May 12, 2014
9ff9312
Fixes in the code.
l-korous May 12, 2014
59baf3d
Gcc fixes.
l-korous May 12, 2014
2414b6e
Gcc fix.
l-korous May 12, 2014
eb970ef
Gcc fixes.
l-korous May 12, 2014
c514fe7
Gcc fixes.
l-korous May 12, 2014
166004b
Gcc fixes.
l-korous May 12, 2014
e657485
Fixing for NOGLUT, gcc.
l-korous May 12, 2014
bc2f335
Fixes.
l-korous May 13, 2014
c10bcf2
Fixes in precalculated tables.
l-korous May 13, 2014
f117a04
Fixes.
l-korous May 13, 2014
9276600
Fix in a test.
l-korous May 13, 2014
67bc4b5
Fix an XSD-searching problem for Windows.
l-korous May 15, 2014
bd0d353
Fix for older MSVC.
l-korous May 15, 2014
cb131a1
More fixes wrt. older MSVC.
l-korous May 15, 2014
03df06b
Fixed a typo in header file.
bzindovic Jun 24, 2014
d862f2d
Merge pull request #118 from bzindovic/devel
l-korous Jun 24, 2014
4adbd10
Rebasing on master.
l-korous Jun 24, 2014
e258d56
Mesh & Refmap rebase.
l-korous Jun 24, 2014
3c3294a
AztecOO rebase.
l-korous Jun 24, 2014
9bf0f9f
Finishing refactor.
l-korous Jun 24, 2014
2a827da
Progress on merging devel into master.
l-korous Jun 24, 2014
e63153a
Work on merging devel and master.
l-korous Jun 24, 2014
bf0c0a3
Finish with refactoring devel - all test examples work + almost all t…
l-korous Jun 26, 2014
d2e24d6
Delete the Newton reuse example.
l-korous Jul 1, 2014
fc8e260
Rename an example.
l-korous Jul 1, 2014
edd091f
A fix of memory leak.
l-korous Jul 1, 2014
b560d31
Fix some mismatched free / delete.
l-korous Jul 1, 2014
2e85f26
Fix memory problems.
l-korous Jul 1, 2014
90987ac
Fix the issue with deallocation of static data.
l-korous Jul 1, 2014
55a2cd1
Fixing gcc problems.
l-korous Jul 1, 2014
ba9697a
Fixing gcc problems.
l-korous Jul 1, 2014
d2eb530
Fixing gcc problems.
l-korous Jul 1, 2014
f524bf9
Fixing gcc problems.
l-korous Jul 1, 2014
cb5bad5
Fixing gcc problems.
l-korous Jul 1, 2014
eb3071f
Fixing gcc problems.
l-korous Jul 1, 2014
a9cf25b
Some fixes.
l-korous Jul 1, 2014
0dac104
Fixing memory leaks.
l-korous Jul 2, 2014
5b7ba02
Code cleaning etc.
l-korous Jul 21, 2014
506b036
Work on CMake.
l-korous Jul 22, 2014
e90a982
Progress.
l-korous Jul 22, 2014
0355020
Code polishing, remove unnecessary Doxygen comments, add new Doxygen …
l-korous Jul 23, 2014
a01edb7
Fix missing header.
l-korous Jul 23, 2014
a3c0df5
Fixing Trilinos.
l-korous Jul 25, 2014
dbc3063
Fix RungeKutta. Now works like a charm.
l-korous Jul 25, 2014
24442c1
Optimize Runge-Kutta example.
l-korous Jul 25, 2014
2f635dd
Work on Trilinos - somehow does not work.
l-korous Jul 25, 2014
d944ab1
Trilinos tutorial works.
l-korous Jul 28, 2014
26efc41
Progress - add utility functions, fix filters, DG etc.
l-korous Jul 29, 2014
20dfa76
Code cleanup.
l-korous Jul 30, 2014
d3895e2
Code cleaning.
l-korous Jul 30, 2014
f213728
Remove typenames before EssentialBCValueType.
l-korous Jul 30, 2014
20b2524
Progress towards release.
l-korous Jul 30, 2014
e54531a
Fixes in Precalc, Curved and Space.
l-korous Jul 31, 2014
8705e3e
Fix some names.
l-korous Jul 31, 2014
d2a098b
Use the latest PARALUTION (0.7).
l-korous Jul 31, 2014
b1e36d5
Fix all tests.
l-korous Aug 1, 2014
2ba3961
Work on filters, documentation.
l-korous Aug 1, 2014
4f0fe17
Work on documentation.
l-korous Aug 3, 2014
edd24b4
Work on documentation some more.
l-korous Aug 3, 2014
20b3610
Several fixes for MUMPS, TRILINOS.
l-korous Aug 3, 2014
d6f9674
Updates of CMake.
l-korous Aug 6, 2014
4a5f233
Fix filter.cpp
l-korous Aug 6, 2014
252eef5
Work on CMake.
l-korous Aug 6, 2014
f788a66
Work on CMake.
l-korous Aug 6, 2014
e77408f
Further work on docs & CMake.
l-korous Aug 6, 2014
75edc09
Try to debug MUMPS.
l-korous Aug 6, 2014
b4768f0
MUMPS CMake refactoring.
l-korous Aug 6, 2014
39d81e8
Add the image for html docs to output.
l-korous Aug 7, 2014
4ec03fa
Work on docs.
l-korous Aug 7, 2014
14e13ce
Add installation of generated files.
l-korous Aug 7, 2014
c5015ee
Fix a problem with calling this method.
l-korous Aug 7, 2014
e4d9a29
A fix for a different static initialization order.
l-korous Aug 7, 2014
72f2533
get_nodes inline function
karban Aug 18, 2014
af45cec
Fixes for Agros to work.
l-korous Aug 18, 2014
00eec3c
Make it possible to only have Agros's CMake setup.
l-korous Aug 20, 2014
1048b0c
Refactor of Precalc for Agros to work.
l-korous Aug 20, 2014
caae754
Some fixes. Actuator and Sparkgap still do not work in Agros.
l-korous Aug 20, 2014
6d93dbf
Final fixes for Agros to work on Windows.
l-korous Aug 21, 2014
fde8dfe
Static data and date lengths tuning for Agros to save memory.
l-korous Aug 22, 2014
2345c7e
Fix export of matrices for Agros tests to pass.
l-korous Aug 25, 2014
989bd69
Debugging failing tests in Agros.
l-korous Aug 25, 2014
f07b35a
Do not insert the atomic section in vector::add if the value is zero.
l-korous Aug 26, 2014
9717d5e
Move discrete_problem.[cpp|h] where it belongs.
l-korous Aug 26, 2014
510eb13
Final pre-release updates.
l-korous Sep 12, 2014
e870b11
Fix documentation.
l-korous Sep 19, 2014
212e78c
Make stuff work and test drive Agros test-flow example.
l-korous Apr 1, 2015
8585c02
Fix a bug.
l-korous May 24, 2015
573c6c1
Fix FindXERCES.cmake.
Jul 11, 2016
8c05ba3
Some fixes.
l-korous Sep 18, 2016
db301b4
Improvements.
l-korous Sep 18, 2016
d7c7141
Fixes
l-korous Sep 24, 2016
0a4d282
Work on examples.
l-korous Sep 26, 2016
9d1ba16
Progress.
l-korous Sep 29, 2016
4a42fd4
Fix README
l-korous Sep 29, 2016
56cd51b
Fix README
l-korous Sep 29, 2016
5180c75
Debian changes.
Sep 30, 2016
7b949fb
Debian rules file fix
Sep 30, 2016
879425f
Fixes in debian
Sep 30, 2016
d620797
Fix
Sep 30, 2016
98c8877
Debian fixes
Sep 30, 2016
efc7307
Fix Bessel
Sep 30, 2016
1670c6e
Linking fix
l-korous Sep 30, 2016
e9d3bb1
Progress.
Oct 15, 2016
91c366e
Fix of string copying issue.
l-korous Oct 26, 2016
4be00e7
Fix of 05 example
l-korous Oct 26, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
58 changes: 0 additions & 58 deletions CMake.vars.example

This file was deleted.

112 changes: 112 additions & 0 deletions CMake.vars.example.Linux
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
# LINUX
# On linux, there should be no need to set up *_ROOT directories, in the default settings, they all point to /usr/local, as should be true on Debian systems.
# We mainly support gcc and CLang compilers with C++11 support.

# BASIC CONFIGURATION

# Global
# Target path
if(NOT(CMAKE_INSTALL_PREFIX))
set(CMAKE_INSTALL_PREFIX "/usr/local")
endif()

# Paths for compulsory dependencies
set(XERCES_ROOT "/usr/local")
set(XSD_ROOT "/usr/local")

# HermesCommon

# Release and debug versions
set(HERMES_COMMON_DEBUG YES)
set(HERMES_COMMON_RELEASE YES)

# BFD
set(WITH_BFD NO)
set(BFD_ROOT "/usr/local")

# TC_MALLOC
set(WITH_TC_MALLOC NO)
set(TCMALLOC_ROOT "/usr/local")

# BSON
set(WITH_BSON NO)
set(BSON_ROOT "/usr/local")

# MATIO
set(WITH_MATIO NO)
set(MATIO_ROOT "/usr/local")
set(MATIO_WITH_HDF5 NO)

# Solvers

# UMFPACK
set(WITH_UMFPACK YES)
set(UMFPACK_ROOT "/usr/local")

# PARALUTION
set(WITH_PARALUTION NO)
set(PARALUTION_ROOT "/usr/local")

# MUMPS
# Sequential version of MUMPS may be enabled by setting YES on the following line
# and pointing to the package installation directory with MUMPS_ROOT. To enable the
# parallel version, setting WITH_MPI to YES in addition to that should suffice. If link
# problems arise, it may be that the automatically found SCALAPACK libraries (reported
# during the CMake configuration phase) do not match those used when compiling MUMPS.
# In this case, set SCALAPACK_LIBRARIES manually and reconfigure Hermes.
# set(SCALAPACK_LIBRARIES -lscalapack -lblacs)
set(WITH_MUMPS NO)
set(MUMPS_ROOT "/usr/local")

# Trilinos
set(WITH_TRILINOS NO)
set(TRILINOS_ROOT "/usr/local")

# Mesh format Exodus II
set(WITH_EXODUSII NO)
set(EXODUSII_ROOT "/usr/local")

# Parallel execution - Enable OpenMP for shared memory processing.
set(WITH_OPENMP YES)

# If MPI is enabled, the MPI library installed on the system should be found by
# CMake automatically. If the found library doesn't match the one used to compile the
# particular MPI-dependent package, the other two options should be used to specify it:
## set(MPI_LIBRARIES -lmpi)
## set(MPI_INCLUDE_PATH /usr/include/openmpi)
set(WITH_MPI NO)

# Experimental
# PJLIB - memory pool implementation
set(WITH_PJLIB NO)
set(PJLIB_ROOT "/usr/local")

# Hermes2D
set(WITH_H2D YES)

# Release and debug versions
set(H2D_DEBUG YES)
set(H2D_RELEASE YES)

# In-house OpenGL visualization
set(H2D_WITH_GLUT YES)
set(GLUT_ROOT "/usr/local")
set(GLEW_ROOT "/usr/local")
set(PTHREAD_ROOT "/usr/local")

# Test examples shipped with the library
set(H2D_WITH_TEST_EXAMPLES YES)


# ADVANCED CONFIGURATION

# Number of solution / filter components.
# Minimum is 1, maximum 999.
set(H2D_MAX_COMPONENTS 10)
# Number of quadratures, recommended is 4.
# Minimum is 2, maximum 999.
set(H2D_MAX_QUADRATURES 4)
# This number has to be smaller than 21.
set(H2D_MAX_HANGING_NODES_LEVEL 15)
# Use second derivatives (that are turned off by default).
set(H2D_USE_SECOND_DERIVATIVES NO)
101 changes: 101 additions & 0 deletions CMake.vars.example.Windows
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# WINDOWS
# On windows, as there is no package manager or "standard" directory structure, we need to get the locations of dependencies.
# We only support Visual Studio on Windows (with C++11 support), and as such, Release / Debug versions are handled by Visual Studio and there is no need or reason to set them up here.

# BASIC CONFIGURATION

# Global
# Generate static libs (instead of dynamic)
set(HERMES_STATIC_LIBS NO)

# Target path
set(CMAKE_INSTALL_PREFIX "d:/hpfem/hermes/dependencies")

# Paths for compulsory dependencies
set(XERCES_ROOT "d:/hpfem/hermes/dependencies")
set(XSD_ROOT "d:/hpfem/hermes/dependencies")

# HermesCommon
# TC_MALLOC
set(WITH_TC_MALLOC NO)
set(TCMALLOC_ROOT "d:/hpfem/hermes/dependencies")

# BSON
set(WITH_BSON NO)
set(BSON_ROOT "d:/hpfem/hermes/dependencies")

# MATIO
set(WITH_MATIO NO)
set(MATIO_ROOT "d:/hpfem/hermes/dependencies")
set(MATIO_WITH_HDF5 NO)

# Solvers

# UMFPACK
set(WITH_UMFPACK YES)
set(UMFPACK_ROOT "d:/hpfem/hermes/dependencies")

# PARALUTION
set(WITH_PARALUTION NO)
set(PARALUTION_ROOT "d:/hpfem/hermes/dependencies")

# MUMPS
# Sequential version of MUMPS may be enabled by setting YES on the following line
# and pointing to the package installation directory with MUMPS_ROOT.
# Winblas (any BLAS library) is also necessary.
# For Win64 platform, ifconsol.lib is also necessary (part of the hermes-windows repository).
set(WITH_MUMPS NO)
set(MUMPS_ROOT "d:/hpfem/hermes/dependencies")
set(WINBLAS_ROOT "d:/hpfem/hermes/dependencies")
if(${CMAKE_CL_64}) # This means that the following is only for 64-bit build.
set(IFCONSOL_LIB_DIRECTORY "d:/hpfem/hermes/dependencies/lib")
endif(${CMAKE_CL_64})

# Trilinos
set(WITH_TRILINOS NO)
set(TRILINOS_ROOT "d:/hpfem/hermes/dependencies")
set(CLAPACK_ROOT "d:/hpfem/hermes/dependencies")

# Mesh format Exodus II
set(WITH_EXODUSII NO)
set(EXODUSII_ROOT "d:/hpfem/hermes/dependencies")

# Parallel execution - Enable OpenMP for shared memory processing.
set(WITH_OPENMP YES)

# If MPI is enabled, the MPI library installed on the system should be found by
# CMake automatically. If the found library doesn't match the one used to compile the
# particular MPI-dependent package, the other two options should be used to specify it:
## set(MPI_LIBRARIES -lmpi)
## set(MPI_INCLUDE_PATH "d:/hpfem/hermes/dependencies/include")
set(WITH_MPI NO)

# Experimental
# PJLIB - memory pool implementation
set(WITH_PJLIB NO)
set(PJLIB_ROOT "d:/hpfem/hermes/dependencies")

# Hermes2D
set(WITH_H2D YES)
# In-house OpenGL visualization
set(H2D_WITH_GLUT YES)
set(GLUT_ROOT "d:/hpfem/hermes/dependencies")
set(GLEW_ROOT "d:/hpfem/hermes/dependencies")
set(PTHREAD_ROOT "d:/hpfem/hermes/dependencies")

# Test examples shipped with the library
set(H2D_WITH_TEST_EXAMPLES YES)


# ADVANCED CONFIGURATION

# Number of solution / filter components.
# Minimum is 1, maximum 999.
set(H2D_MAX_COMPONENTS 10)
# Number of quadratures, recommended is 4.
# Minimum is 2, maximum 999.
set(H2D_MAX_QUADRATURES 4)
# This number has to be smaller than 21.
set(H2D_MAX_HANGING_NODES_LEVEL 15)
# Use second derivatives (that are turned off by default).
set(H2D_USE_SECOND_DERIVATIVES NO)
Loading