Commit 2c200015 authored by crosetto's avatar crosetto
Browse files

removing old flag, small other changes

parent fede9d3e
...@@ -391,12 +391,12 @@ public: ...@@ -391,12 +391,12 @@ public:
// void setBC( fluid_bchandler_type& bc_u, solid_bchandler_type& bc_d, fluid_bchandler_type& bc_m ); // void setBC( fluid_bchandler_type& bc_u, solid_bchandler_type& bc_d, fluid_bchandler_type& bc_m );
void setFluidBC ( const fluid_bchandler_type& bc_fluid ); virtual void setFluidBC ( const fluid_bchandler_type& bc_fluid );
void setLinFluidBC ( const fluid_bchandler_type& bc_dfluid ) { M_BCh_du = bc_dfluid; } void setLinFluidBC ( const fluid_bchandler_type& bc_dfluid ) { M_BCh_du = bc_dfluid; }
void setInvLinFluidBC ( const fluid_bchandler_type& bc_dfluid_inv ) { M_BCh_du_inv = bc_dfluid_inv; } void setInvLinFluidBC ( const fluid_bchandler_type& bc_dfluid_inv ) { M_BCh_du_inv = bc_dfluid_inv; }
void setHarmonicExtensionBC ( const fluid_bchandler_type& bc_he ); void setHarmonicExtensionBC ( const fluid_bchandler_type& bc_he );
void setSolidBC ( const solid_bchandler_type& bc_solid ); virtual void setSolidBC ( const solid_bchandler_type& bc_solid );
void setLinSolidBC ( const solid_bchandler_type& bc_dsolid ) { M_BCh_dz = bc_dsolid; } void setLinSolidBC ( const solid_bchandler_type& bc_dsolid ) { M_BCh_dz = bc_dsolid; }
void setInvLinSolidBC ( const solid_bchandler_type& bc_dsolid_inv ) { M_BCh_dz_inv = bc_dsolid_inv; } void setInvLinSolidBC ( const solid_bchandler_type& bc_dsolid_inv ) { M_BCh_dz_inv = bc_dsolid_inv; }
......
...@@ -61,7 +61,7 @@ FSISolver::FSISolver( const std::string& method ): ...@@ -61,7 +61,7 @@ FSISolver::FSISolver( const std::string& method ):
int fluidLeader(0); int fluidLeader(0);
int solidLeader(0); int solidLeader(0);
if( ( method.compare("monolithic") && method.compare("fullMonolithic") ) ) if( ( method.compare("monolithicGE") && method.compare("monolithicGI") ) )
{ {
MPI_Group originGroup, newGroup; MPI_Group originGroup, newGroup;
MPI_Comm newComm; MPI_Comm newComm;
......
...@@ -384,7 +384,6 @@ protected: ...@@ -384,7 +384,6 @@ protected:
bool M_recomputeMatrix; bool M_recomputeMatrix;
// int M_monolithic;
bool M_isDiagonalBlockPrec; bool M_isDiagonalBlockPrec;
//private: //private:
......
...@@ -316,7 +316,6 @@ private: ...@@ -316,7 +316,6 @@ private:
int M_count; int M_count;
UInt M_offset; UInt M_offset;
bool M_monolithic;
Real M_rescaleFactor; Real M_rescaleFactor;
// //
...@@ -476,7 +475,6 @@ VenantKirchhofSolver<Mesh, SolverType>::setUp( const GetPot& dataFile ) ...@@ -476,7 +475,6 @@ VenantKirchhofSolver<Mesh, SolverType>::setUp( const GetPot& dataFile )
M_linearSolver->setDataFromGetPot( dataFile, "solid/solver" ); M_linearSolver->setDataFromGetPot( dataFile, "solid/solver" );
M_linearSolver->setUpPrec(dataFile, "solid/prec"); M_linearSolver->setUpPrec(dataFile, "solid/prec");
M_monolithic = dataFile("problem/monolithic" , false );
} }
template <typename Mesh, typename SolverType> template <typename Mesh, typename SolverType>
......
...@@ -211,7 +211,7 @@ private: ...@@ -211,7 +211,7 @@ private:
const Epetra_Map M_operatorDomainMap; const Epetra_Map M_operatorDomainMap;
const Epetra_Map M_operatorRangeMap; const Epetra_Map M_operatorRangeMap;
Epetra_Comm* M_comm; Epetra_Comm* M_comm;
}; };
......
Supports Markdown
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