Commit 7a7d359c authored by incardon's avatar incardon

Fixing cartesian decompisition

parent 14bdaa13
......@@ -6,8 +6,9 @@ LDIR =
OPT=
OBJ_VIC_PETSC = main_vic_petsc.o
OBJ_VIC_PETSC_OPT = main_vic_petsc_opt.o
all: vic_petsc
all: vic_petsc vic_petsc_opt
vic_petsc_test: OPT += -DTEST_RUN
vic_petsc_test: vic_petsc
......@@ -15,9 +16,11 @@ vic_petsc_test: vic_petsc
%.o: %.cpp
$(CC) -O3 $(OPT) -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH)
vic_petsc_opt: $(OBJ_VIC_PETSC_OPT)
$(CC) -o $@ $^ $(LIBS_PATH) $(LIBS)
vic_petsc: $(OBJ_VIC_PETSC)
$(CC) -o $@ $^ $(LIBS_PATH) $(LIBS_SE2)
$(CC) -o $@ $^ $(LIBS_PATH) $(LIBS)
run: vic_petsc_test
mpirun -np 4 ./vic_petsc
......
......@@ -865,7 +865,7 @@ public:
* \return itself
*
*/
CartDecomposition<dim,T,Memory> & operator=(const CartDecomposition & cart)
CartDecomposition<dim,T,Memory, Distribution> & operator=(const CartDecomposition & cart)
{
static_cast<ie_loc_ghost<dim,T>*>(this)->operator=(static_cast<ie_loc_ghost<dim,T>>(cart));
static_cast<nn_prcs<dim,T>*>(this)->operator=(static_cast<nn_prcs<dim,T>>(cart));
......
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