scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

partial fix for adios read random 

git-svn-id: https://subversion.assembla.com/svn/qmcdev/trunk@6023 e5b18d87-469d-4833-9cc0-8cdfa06e9491
This commit is contained in:
Cynthia Gu 2013-10-24 23:14:40 +00:00
parent 91b5a8484b
commit f201a0b845
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/ADIOS/ADIOS_config.h
View File

@ -2,10 +2,12 @@
#ifndef ADIOS_ADIOS_CONFIG_H
#define ADIOS_ADIOS_CONFIG_H
#ifdef HAVE_ADIOS
#include <stdint.h>
#include "Utilities/RandomGenerator.h"
#include <string>
#include <Configuration.h>
#include <cstring>
#ifdef HAVE_ADIOS
#include <adios_read.h>
namespace ADIOS
@ -19,7 +21,7 @@ const std::string& get_adios_xml();
static string adiosname;
static ADIOS_FILE * openfp;
//void open(const string &fname, MPI_Comm comm);
typedef qmcplusplus::RandomGenerator_t::uint_type uint_type;
inline void open(const string &fname, MPI_Comm comm)
{
@ -64,6 +66,49 @@ void read(T data, const std::string& aname)
adios_free_varinfo (vi);
}
template <class T, class S>
void read_random(T& data, S& shape, const std::string& aname)
{
ADIOS_VARINFO *vi;
int size;
char * name = new char [aname.length()+1];
std::strcpy (name, aname.c_str());
if ( openfp == NULL)
{
qmcplusplus::app_error()<<"openfp is null "<<endl;
}
uint64_t DIM = 2;
uint64_t * start= (uint64_t *)malloc(sizeof(uint64_t)*DIM);
uint64_t * count= (uint64_t *)malloc(sizeof(uint64_t)*DIM);
start[0] = 0;
start[1] = 0;
count[0] = 1;
vi = adios_inq_var(openfp, name);
adios_inq_var_blockinfo (openfp, vi);
if (vi->ndim != 2)
{
qmcplusplus::app_error() <<"random number dimension is not 2."<<endl;
}
ADIOS_SELECTION *sel;
uint_type * data1 = (uint_type * ) malloc(sizeof(uint_type)*vi->dims[0]*vi->dims[1]);
shape[0] = vi->dims[0];
shape[1] = vi->dims[1];
count[1] = vi->dims[1];
sel = adios_selection_boundingbox(DIM, start, count);
adios_schedule_read(openfp, sel, name, 0, 1, data1);
adios_perform_reads(openfp, 1);
data.assign(data1, data1+vi->dims[0]*vi->dims[1]);
free(data1);
adios_free_varinfo (vi);
adios_selection_delete(sel);
}
inline void close()
{
int ret = adios_read_close(openfp);

3
src/OhmmsApp/RandomNumberControl.cpp
View File

@ -246,8 +246,7 @@ void RandomNumberControl::read(const string& fname, Communicate* comm)
ADIOS::open(fname, comm->getMPI());
TinyVector<hsize_t,2> shape_t(0);
shape_t[1]=Random.state_size();
//shape[0]=static_cast<int>(slab.size(0));
//shape[1]=static_cast<int>(slab.size(1));
//ADIOS::read_random(vt_tot, shape, "random");
ADIOS::close();
}
else if(ADIOS::useHDF5())