Liebe Gitlab-Nutzer, lieber Gitlab-Nutzer, es ist nun möglich sich mittels des ZIH-Logins/LDAP an unserem Dienst anzumelden. Die Konto der externen Nutzer:innen sind über den Reiter "Standard" erreichbar. Die Administratoren

Dear Gitlab user, it is now possible to log in to our service using the ZIH login/LDAP. The accounts of external users can be accessed via the "Standard" tab. The administrators

Commit f4aa2f3e authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

correct MTL directory found

parent 820a1149
......@@ -40,8 +40,8 @@ else()
message(ERROR "could not detect the AMDiS include directory. Please set the variable AMDIS_INCLUDE_DIR to the directory containing the AMDiS headers.")
endif()
unset(_AMDIS_H CACHE)
set(MTL_DIR @MTL_INCLUDE_DIR@ CACHE PATH "the mtl directory")
list(APPEND AMDIS_INCLUDE_DIRS ${MTL_DIR})
# set(MTL_DIR @MTL_INCLUDE_DIR@ CACHE PATH "the mtl directory")
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/mtl4)
# AMDiS base libraries
# --------------------
......
......@@ -488,7 +488,7 @@ if(ENABLE_EXTENSIONS)
if(ENABLE_BASE_PROBLEMS)
SET(BASE_PROBLEMS_SRC
${EXTENSIONS_DIR}/base_problems/CahnHilliard.cc
# ${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
......
......@@ -163,12 +163,10 @@ namespace AMDiS {
bool initMesh = initFlag.isSet(INIT_MESH);
// Initialize the meshes if there is no serialization file.
if (initMesh && meshes[i] && !(meshes[i]->isInitialized()))
if (initMesh && meshes[i] && !(meshes[i]->isInitialized())) {
meshes[i]->initialize();
// do global refinements
if (initMesh && meshes[i])
refinementManager->globalRefine(meshes[i], globalRefinements);
}
}
}
......
......@@ -273,6 +273,16 @@ struct Component : public AbstractFunction<T, WorldVector<T> >
return x[c];
}
};
template<typename T=double>
struct Component2 : public AbstractFunction<T, WorldVector<T> >
{
Component2(int comp, int degree = 1) : AbstractFunction<T, WorldVector<T> >(degree), c_(comp) {}
T operator()(const WorldVector<T> &x) const {
return x[c_];
}
private:
int c_;
};
struct FadeOut : public TertiaryAbstractFunction<double, double, double ,double>
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment