Commit 1f5ee0d3 by Francois Gygi

removed dependency on Context

git-svn-id: http://qboxcode.org/svn/qb/trunk@1335 cba15fb0-1239-40c8-b417-11db7ca47a34
parent dd343b51
...@@ -15,10 +15,8 @@ ...@@ -15,10 +15,8 @@
// testBasis.C // testBasis.C
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// $Id: testBasis.C,v 1.7 2008-09-08 15:56:20 fgygi Exp $
#include "Basis.h" #include "Basis.h"
#include "Context.h"
#include <iostream> #include <iostream>
#include <new> #include <new>
#include <cstdlib> #include <cstdlib>
...@@ -52,10 +50,22 @@ int main(int argc, char **argv) ...@@ -52,10 +50,22 @@ int main(int argc, char **argv)
int npr = atoi(argv[14]); int npr = atoi(argv[14]);
int npc = atoi(argv[15]); int npc = atoi(argv[15]);
Context ctxt(npr,npc);
UnitCell cell(a0,a1,a2); UnitCell cell(a0,a1,a2);
Basis basis(ctxt,kpoint); // create cartesian communicator
int ndims=2;
int dims[2] = {npr, npc};
int periods[2] = { 0, 0};
int reorder = 0;
MPI_Comm cartcomm;
MPI_Cart_create(MPI_COMM_WORLD,ndims,dims,periods,reorder,&cartcomm);
// partition the cartesian communicator in columns
MPI_Comm colcomm;
int remain_dims[2] = { 1, 0 };
MPI_Cart_sub(cartcomm,remain_dims,&colcomm);
Basis basis(colcomm,kpoint);
try try
{ {
basis.resize(cell,cell,ecut); basis.resize(cell,cell,ecut);
...@@ -66,10 +76,13 @@ int main(int argc, char **argv) ...@@ -66,10 +76,13 @@ int main(int argc, char **argv)
throw; throw;
} }
for (int ipe = 0; ipe < ctxt.size(); ipe++ ) int npes, mype;
MPI_Comm_size(colcomm,&npes);
MPI_Comm_rank(colcomm,&mype);
for (int ipe = 0; ipe < npes; ipe++ )
{ {
ctxt.barrier(); MPI_Barrier(colcomm);
if ( ipe == ctxt.mype() ) if ( ipe == mype )
{ {
cout << basis; cout << basis;
cout << endl; cout << endl;
......
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