From 6d7d0c750baf39f1a78ef08e4c8b56003b8537a8 Mon Sep 17 00:00:00 2001
From: Bruno Seny <bruno.seny@student.uclouvain.be>
Date: Mon, 5 Mar 2012 18:09:00 +0000
Subject: [PATCH] Global update for MultiRate
---
Mesh/meshPartition.cpp | 6 ------
Mesh/meshPartitionObjects.h | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/Mesh/meshPartition.cpp b/Mesh/meshPartition.cpp
index 199468841c..a0164a2caf 100644
--- a/Mesh/meshPartition.cpp
+++ b/Mesh/meshPartition.cpp
@@ -458,15 +458,9 @@ int PartitionGraph(Graph &graph, meshPartitionOptions &options)
metisOptions[2] = 1;
metisOptions[3] = options.refine_algorithm;
metisOptions[4] = 0;
- printf("Tolerance for Constraints:[");
for(int u=0;u<options.ncon;u++){
ubvec[u]=1.03;
- if(options.tolerance[u]%options.num_partitions>0){
- //ubvec[u] = (float) ceil((float)options.tolerance[u]/options.num_partitions)/((float)options.tolerance[u]/options.num_partitions);
- }
- printf(" %f", ubvec[u]);
}
- printf("] \n");
graph.fillWithMultipleWeights(options.ncon,options.getWeightMap());
if (options.num_partitions > 1) {
METIS_mCPartGraphKway
diff --git a/Mesh/meshPartitionObjects.h b/Mesh/meshPartitionObjects.h
index e4a19610c2..53f67cdefe 100644
--- a/Mesh/meshPartitionObjects.h
+++ b/Mesh/meshPartitionObjects.h
@@ -194,7 +194,7 @@ class Graph
int localElNum=0;
for(eIt=element.begin();eIt !=element.end();eIt++){
for(int i=0; i<ncon; i++){
- vwgts[localElNum*ncon+i]=weightMap[(*eIt)->getNum()][i];
+ vwgts[localElNum*ncon+i]=weightMap[(*eIt)->getNum()][i+1];
}
for(int j=xadj[localElNum];j<xadj[localElNum+1];j++){
adjwgts[j]+=weightMap[(*eIt)->getNum()][0];
--
GitLab