# Conflicts:
#	src/Configuration/Configuration.hpp
#	src/Modelparameter/Acoustic.hpp
#	src/Modelparameter/Elastic.hpp
#	src/Modelparameter/Modelparameter.hpp
#	src/Modelparameter/Viscoelastic.hpp

# Conflicts:
#	src/Configuration/Configuration.hpp

# Conflicts:
#	src/ForwardSolver/ForwardSolver.hpp
#	src/ForwardSolver/ForwardSolver2Dacoustic.hpp
#	src/ForwardSolver/ForwardSolver2Delastic.hpp
#	src/ForwardSolver/ForwardSolver2Dvisco.hpp
#	src/ForwardSolver/ForwardSolver3Dacoustic.hpp
#	src/ForwardSolver/ForwardSolver3Delastic.hpp
#	src/ForwardSolver/ForwardSolver3Dvisco.hpp

Changed get configuration parameter functions to get<IndexType>, get<ValueType> and get<std::string>.

Merge branch 'develop' of https://git.scc.kit.edu/WAVE/FDSimulation_LAMA into feature/getConfiguration

# Conflicts:
#	src/Acquisition/Seismogram.hpp
#	src/SOFI2Dacoustic.cpp
#	src/SOFI2Delastic.cpp
#	src/SOFI2Dvisco.cpp
#	src/SOFI3Dacoustic.cpp
#	src/SOFI3Delastic.cpp
#	src/SOFI3Dvisco.cpp

Configuration settings can be read getIndex, getValue and getString.

Fixed a bug within the initialization of the derivative matrix in z-direction.

Added PartitionedInOut class.
Including partitioned-input of model from distributed files-block.
Including partitioned-output of model to a single file or distributed files-block.
Merge branch 'develop' of https://git.scc.kit.edu/WAVE/FDSimulation_LAMA into feature/PartitionIO

# Conflicts:
#	src/Configuration/Configuration.hpp
#	src/Modelparameter/Elastic.hpp
#	src/Modelparameter/Modelparameter.hpp

Added initialisation of matrices.
All Bugs removed.
Added model as const to ForwardSolver.
Adder prepareForModelling() to main function, so model can be handled as const afterwards.

Merge branch 'develop' of https://git.scc.kit.edu/WAVE/FDSimulation_LAMA into feature/averaging

# Conflicts:
#	src/ForwardSolver/ForwardSolver2Dacoustic.hpp
#	src/ForwardSolver/ForwardSolver2Delastic.hpp
#	src/ForwardSolver/ForwardSolver2Dvisco.hpp
#	src/ForwardSolver/ForwardSolver3Dacoustic.hpp
#	src/ForwardSolver/ForwardSolver3Delastic.hpp
#	src/ForwardSolver/ForwardSolver3Dvisco.hpp
#	src/Modelparameter/Acoustic.hpp
#	src/Modelparameter/Elastic.hpp
#	src/Modelparameter/Modelparameter.hpp
#	src/Modelparameter/Viscoelastic.hpp