Commit 43dc7105 authored by Kirill Terekhov's avatar Kirill Terekhov

update

parent afa4d294
Pipeline #132 canceled with stages
......@@ -75,7 +75,7 @@ int main(int argc,char ** argv)
//~ if( m->GetProcessorRank() == 0 ) std::cout << "Load(MPI_Scatter): " << Timer()-ttt2 << std::endl;
#if defined(USE_PARTITIONER)
if (!repartition)
if (m->GetProcessorsNumber() > 1)
{ // currently only non-distributed meshes are supported by Inner_RCM partitioner
ttt = Timer();
Partitioner * p = new Partitioner(m);
......@@ -107,6 +107,7 @@ int main(int argc,char ** argv)
}
else
{
std::cout << "Set perm" << std::endl;
tag_K = m->CreateTag("PERM",DATA_REAL,CELL,NONE,1); // Create a new tag for K tensor
for( Mesh::iteratorCell cell = m->BeginCell(); cell != m->EndCell(); ++cell ) // Loop over mesh cells
tag_K[*cell][0] = 1.0; // Store the tensor K value into the tag
......@@ -119,7 +120,8 @@ int main(int argc,char ** argv)
}
else
{
tag_F = m->CreateTag("PERM",DATA_REAL,CELL,NONE,1); // Create a new tag for external force
std::cout << "Set rhs" << std::endl;
tag_F = m->CreateTag("FORCE",DATA_REAL,CELL,NONE,1); // Create a new tag for external force
double x[3];
for( Mesh::iteratorCell cell = m->BeginCell(); cell != m->EndCell(); ++cell ) // Loop over mesh cells
{
......@@ -135,10 +137,11 @@ int main(int argc,char ** argv)
}
else
{
std::cout << "Set boundary conditions" << std::endl;
double x[3];
tag_BC = m->CreateTag("BOUNDARY_CONDITION",DATA_REAL,CELL,NONE,3);
tag_BC = m->CreateTag("BOUNDARY_CONDITION",DATA_REAL,FACE,NONE,3);
for( Mesh::iteratorFace face = m->BeginFace(); face != m->EndFace(); ++face )
if( face->Boundary() && face->GetStatus() == Element::Owned )
if( face->Boundary() && !(face->GetStatus() == Element::Ghost) )
{
face->Centroid(x);
tag_BC[*face][0] = 1; //dirichlet
......
......@@ -88,8 +88,8 @@ int main(int argc,char ** argv)
//~ if( m->GetProcessorRank() == 0 ) std::cout << "Load(MPI_Scatter): " << Timer()-ttt2 << std::endl;
#if defined(USE_PARTITIONER)
if (m->GetProcessorsNumber() > 1 && !repartition)
{ // currently only non-distributed meshes are supported by Inner_RCM partitioner
if (m->GetProcessorsNumber() > 1 )// && !repartition)
{ // currently only non-distributed meshes are supported by Inner_RCM partitioner
ttt = Timer();
Partitioner * p = new Partitioner(m);
p->SetMethod(Partitioner::INNER_KMEANS,Partitioner::Partition); // Specify the partitioner
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "ACUTE_TRIANGULAR";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "DISTURBED";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "HEXAGONAL";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "KERSHAW";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "NONCONVEX";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "SHESTAKOV";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "SINUSOIDAL";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "TRANSFORMED";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
using namespace INMOST;
std::string problem_name = "advection_degenerate_diffusion_reaction";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
using namespace INMOST;
std::string problem_name = "single_well";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <time.h>
#include "inmost.h"
std::string mesh_name = "TRANSFORMED";
......
#include "inmost.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include "inmost.h"
using namespace INMOST;
std::string problem_name = "two_wells_3d";
......
......@@ -18,11 +18,11 @@ namespace INMOST
template<> Demote<variable>::type AbstractEntry::Access<variable> (const Storage& e, INMOST_DATA_ENUM_TYPE pos) const {return Unknown(e,pos);}
template<> Demote<hessian_variable>::type AbstractEntry::Access<hessian_variable> (const Storage& e, INMOST_DATA_ENUM_TYPE pos) const {return Unknown(e,pos);}
template<> Matrix<typename Demote<INMOST_DATA_REAL_TYPE>::type> AbstractEntry::Access<INMOST_DATA_REAL_TYPE> (const Storage& e) const {return Value(e);}
template<> Matrix<typename Demote<INMOST_DATA_INTEGER_TYPE>::type> AbstractEntry::Access<INMOST_DATA_INTEGER_TYPE>(const Storage& e) const {return Index(e);}
template<> Matrix<typename Demote<unknown>::type> AbstractEntry::Access<unknown> (const Storage& e) const {return Unknown(e);}
template<> Matrix<typename Demote<variable>::type> AbstractEntry::Access<variable> (const Storage& e) const {return Unknown(e);}
template<> Matrix<typename Demote<hessian_variable>::type> AbstractEntry::Access<hessian_variable> (const Storage& e) const {return Unknown(e);}
template<> Matrix<Demote<INMOST_DATA_REAL_TYPE>::type> AbstractEntry::Access<INMOST_DATA_REAL_TYPE> (const Storage& e) const {return Value(e);}
template<> Matrix<Demote<INMOST_DATA_INTEGER_TYPE>::type> AbstractEntry::Access<INMOST_DATA_INTEGER_TYPE>(const Storage& e) const {return Index(e);}
template<> Matrix<Demote<unknown>::type> AbstractEntry::Access<unknown> (const Storage& e) const {return Unknown(e);}
template<> Matrix<Demote<variable>::type> AbstractEntry::Access<variable> (const Storage& e) const {return Unknown(e);}
template<> Matrix<Demote<hessian_variable>::type> AbstractEntry::Access<hessian_variable> (const Storage& e) const {return Unknown(e);}
#if defined(USE_MESH)
......
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