From 6d308ef26f0800da32bfaabf14e04f73ec5c9e15 Mon Sep 17 00:00:00 2001
From: lschulze <lschulze@mpi-cbg.de>
Date: Wed, 8 Dec 2021 18:05:58 +0100
Subject: [PATCH] Allow for bicubic and quadratic interpolation here
---
src/DCPSE/MonomialBasis.hpp | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/DCPSE/MonomialBasis.hpp b/src/DCPSE/MonomialBasis.hpp
index b16071e4..bf978cce 100644
--- a/src/DCPSE/MonomialBasis.hpp
+++ b/src/DCPSE/MonomialBasis.hpp
@@ -137,16 +137,10 @@ void MonomialBasis<dim>::generateBasis(std::vector<unsigned int> m, unsigned int
grid_key_dx_iterator_sub_bc<dim> it(grid, start, stop, bc);
// Finally compute alpha_min
-<<<<<<< Updated upstream
- //unsigned char alphaMin = static_cast<unsigned char>(!(mSum % 2)); // if mSum is even, alpha_min must be 1
-=======
unsigned char alphaMin = static_cast<unsigned char>(!(mSum % 2)); // if mSum is even, alpha_min must be 1
- //std::cout<<"AlphaMin: "<<alphaMin<<std::endl;
alphaMin = 0; // we want to always have 1 in the basis
->>>>>>> Stashed changes
-
- unsigned char alphaMin = 0; // we want to always have 1 in the basis
//std::cout<<"AlphaMin: "<<alphaMin<<std::endl;
+
while (it.isNext())
{
Point<dim, long int> p = it.get().get_k();
@@ -179,12 +173,8 @@ void MonomialBasis<dim>::generateInterpolBasis(unsigned int orderLimit)
grid_key_dx_iterator_sub_bc<dim> it(grid, start, stop, bc);
// Finally compute alpha_min
-<<<<<<< Updated upstream
//unsigned char alphaMin = static_cast<unsigned char>(!(mSum % 2)); // if mSum is even, alpha_min must be 1
- //std::cout<<"AlphaMin: "<<alphaMin<<std::endl;
unsigned char alphaMin = 0; // we want to always have 1 in the basis
-=======
->>>>>>> Stashed changes
//std::cout<<"AlphaMin: "<<alphaMin<<std::endl;
while (it.isNext())
{
--
GitLab