db refactr

This commit is contained in:
James E McClure committed 2018-05-15 16:03:29 -04:00
1 parent 7528a34972
commit 740ec1e432
4 files changed
+6 -9

No files matched your search

+1 -2
View File
@@ -88,8 +88,7 @@ int main(int argc, char **argv)
string FILENAME = argv[1];
// Load inputs
if (rank==0) printf("Loading input database \n");
auto db = std::make_shared<Database>(FILENAME);
auto domain_db= db-> getDatabase("Domain");
auto domain_db = std::make_shared<Database>(FILENAME);
int Nx = domain_db->getVector<int>( "n" )[0];
int Ny = domain_db->getVector<int>( "n" )[1];
int Nz = domain_db->getVector<int>( "n" )[2];
+3 -4
View File
@@ -25,19 +25,18 @@ int main (int argc, char *argv[])
MPI_Comm_size(comm,&nprocs);
int i,j,k,n;
// Load inputs
// Load inputs
string FILENAME = argv[1];
// Load inputs
if (rank==0) printf("Loading input database \n");
auto db = std::make_shared<Database>(FILENAME);
auto domain_db= db-> getDatabase("Domain");
auto domain_db = std::make_shared<Database>(FILENAME);
int Nx = domain_db->getVector<int>( "n" )[0];
int Ny = domain_db->getVector<int>( "n" )[1];
int Nz = domain_db->getVector<int>( "n" )[2];
int nprocx = domain_db->getVector<int>( "nproc" )[0];
int nprocy = domain_db->getVector<int>( "nproc" )[1];
int nprocz = domain_db->getVector<int>( "nproc" )[2];
Domain Dm(db);
for (i=0; i<Dm.Nx*Dm.Ny*Dm.Nz; i++) Dm.id[i] = 1;
-1
View File
@@ -41,7 +41,6 @@ int main(int argc, char **argv)
int i,j,k,n;
int timestep = 0;
tau = 1.0;
double mu=(tau-0.5)/3.0;
double rlx_setA=1.0/tau;
+2 -2
View File
@@ -44,9 +44,9 @@ int main(int argc, char **argv)
// Load inputs
string FILENAME = argv[1];
// Load inputs
if (rank==0) printf("Loading input database \n");
auto db = std::make_shared<Database>(FILENAME);
auto domain_db= db-> getDatabase("Domain");
auto domain_db = std::make_shared<Database>(FILENAME);
int Nx = domain_db->getVector<int>( "n" )[0];
int Ny = domain_db->getVector<int>( "n" )[1];
int Nz = domain_db->getVector<int>( "n" )[2];