Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-organized some includes and removed pieces of unused code #100

Merged
merged 2 commits into from
Jun 14, 2018
Merged

Re-organized some includes and removed pieces of unused code #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
608218d
Re-organized some includes
wenqing Jun 8, 2018
211ee22
Removed pieces of unused code
wenqing Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions FEM/fem_ele.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#include "femlib.h"
#include "mathlib.h"

#ifndef USE_PETSC
#include "par_ddc.h"
#endif

#include "ShapeFunctionPool.h"

namespace FiniteElement
Expand Down
11 changes: 3 additions & 8 deletions FEM/fem_ele.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,10 @@

#define fem_INC

// C++
//#include <vector>
//#include <string>

#if defined(USE_PETSC) // || defined(other parallel libs)//03.3012. WW
#include "prototyp.h"
#else
// MSH
#include "par_ddc.h" //OK //Moved from fem_ele_std.h. WW

#ifndef USE_PETSC
class CPARDomain;
#endif

#include "MSHEnums.h"
Expand Down
4 changes: 4 additions & 0 deletions FEM/fem_ele_std.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
using Math_Group::CSparseMatrix;
#endif

#ifndef USE_PETSC
#include "par_ddc.h"
#endif

#ifdef OGS_USE_CVODE
extern "C" {
#include <cvode/cvode.h> /* prototypes for CVODE fcts., consts. */
Expand Down
5 changes: 5 additions & 0 deletions FEM/fem_ele_vec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
#include "equation_class.h"
using Math_Group::CSparseMatrix;
#endif

#ifndef USE_PETSC
#include "par_ddc.h"
#endif

//
#define COMP_MOL_MASS_AIR 28.96 // kg/kmol WW 28.96
#define GAS_CONSTANT 8314.41 // J/(kmol*K) WW
Expand Down
Loading