diff --git a/include/core/mobility_cahn_hilliard_model.h b/include/core/mobility_cahn_hilliard_model.h index c5812b38f3..ab373164ca 100644 --- a/include/core/mobility_cahn_hilliard_model.h +++ b/include/core/mobility_cahn_hilliard_model.h @@ -57,10 +57,10 @@ class MobilityCahnHilliardModel : public InterfacePropertyModel virtual double get_mobility_constant() = 0; - /** - * @brief Definition of a virtual destructor - */ - virtual ~MobilityCahnHilliardModel() = default; +// /** +// * @brief Definition of a virtual destructor +// */ +// virtual ~MobilityCahnHilliardModel() = default; }; /** @@ -77,10 +77,10 @@ class MobilityCahnHilliardModelConstant : public MobilityCahnHilliardModel : mobility_cahn_hilliard_constant(p_mobility_cahn_hilliard_constant) {} - /** - * @brief Destructor of derived class - */ - ~MobilityCahnHilliardModelConstant() = default; +// /** +// * @brief Destructor of derived class +// */ +// ~MobilityCahnHilliardModelConstant() = default; /** @@ -182,10 +182,10 @@ class MobilityCahnHilliardModelQuartic : public MobilityCahnHilliardModel this->model_depends_on[field::phase_order_cahn_hilliard_filtered] = true; } - /** - * @brief Destructor of derived class - */ - ~MobilityCahnHilliardModelQuartic() = default; +// /** +// * @brief Destructor of derived class +// */ +// ~MobilityCahnHilliardModelQuartic() = default; /** * @brief Method to get the model used for the mobility @@ -225,6 +225,7 @@ class MobilityCahnHilliardModelQuartic : public MobilityCahnHilliardModel // return mobility_cahn_hilliard_constant * // (1 - phase_order_cahn_hilliard * phase_order_cahn_hilliard) * // (1 - phase_order_cahn_hilliard * phase_order_cahn_hilliard); + std::cout<<"phase order value in filter = "< 1) return 0.0; else @@ -259,6 +260,7 @@ class MobilityCahnHilliardModelQuartic : public MobilityCahnHilliardModel field_vectors.at(field::phase_order_cahn_hilliard_filtered); for (unsigned int i = 0; i < property_vector.size(); ++i) { + std::cout<<"phase order value in filter = "< 1) property_vector[i] = 0.0; else @@ -290,6 +292,7 @@ class MobilityCahnHilliardModelQuartic : public MobilityCahnHilliardModel const double &phase_order_cahn_hilliard_filtered = fields_value.at(field::phase_order_cahn_hilliard_filtered); + std::cout<<"phase order value in filter = "< 1) return 0.0; else diff --git a/include/core/parameters.h b/include/core/parameters.h index cb41b1dfe9..4755d4ff02 100644 --- a/include/core/parameters.h +++ b/include/core/parameters.h @@ -380,7 +380,7 @@ namespace Parameters // tracer diffusivity in L^2/s double tracer_diffusivity; // Cahn-Hilliard mobility in L^2/s - // double mobility_cahn_hilliard; + double mobility_cahn_hilliard; // Phase change parameters PhaseChange phase_change_parameters; diff --git a/source/core/parameters.cc b/source/core/parameters.cc index 1087e4a195..a7778d1c45 100644 --- a/source/core/parameters.cc +++ b/source/core/parameters.cc @@ -1125,6 +1125,7 @@ namespace Parameters // Surface tension op = prm.get("surface tension model"); + std::cout<::assemble_matrix( this->cahn_hilliard_parameters.cahn_hilliard_mobility_constant; const auto mobility_model = this->cahn_hilliard_parameters.cahn_hilliard_mobility_model; - // std::cout<< "mobility via ch assembler = "<< mobility_constant<