ATC version 2.0, date: Aug21

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10638 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
rjones
2013-08-21 23:06:07 +00:00
parent 0f69054d68
commit d77ab2f96a
161 changed files with 3811 additions and 2548 deletions

View File

@ -8,6 +8,7 @@
// other includes
#include <vector>
#include <map>
#include <set>
namespace ATC {
@ -98,7 +99,7 @@ class SliceSchrodingerSolver : public SchrodingerSolver {
const FE_Engine * feEngine,
const PrescribedDataManager * prescribedDataMgr,
/*const*/ ATC_Coupling * atc,
const Array< set<int> > & oneDslices,
const Array< std::set<int> > & oneDslices,
const int solverType = ATC::LinearSolver::DIRECT_SOLVE,
bool parallel = false
);
@ -115,11 +116,11 @@ class SliceSchrodingerSolver : public SchrodingerSolver {
/** solve */
virtual bool solve(FIELDS & fields);
Array< set<int> > & slices(void){ return oneDslices_;}
Array< std::set<int> > & slices(void){ return oneDslices_;}
protected:
Array< set<int> > oneDslices_;
Array< std::set<int> > oneDslices_;
};
@ -172,7 +173,7 @@ class SliceSchrodingerPoissonSolver : public SchrodingerPoissonSolver {
int oneDcoor_;
double Ef_shift_;
double safe_dEf_;
Array< set<int> > & oneDslices_;
Array< std::set<int> > & oneDslices_;
Array2D<double> EfHistory_;
};