ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/Stats.cpp
(Generate patch)

Comparing branches/development/src/brains/Stats.cpp (file contents):
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC vs.
Revision 1777 by gezelter, Thu Aug 9 18:35:09 2012 UTC

# Line 280 | Line 280 | namespace OpenMD {
280      tagged_pair_distance.accumulator = new Accumulator();
281      data_[TAGGED_PAIR_DISTANCE] = tagged_pair_distance;
282      statsMap_["TAGGED_PAIR_DISTANCE"] =  TAGGED_PAIR_DISTANCE;
283
284    StatsData rnemd_exchange_total;
285    rnemd_exchange_total.units =  "Variable";
286    rnemd_exchange_total.title =  "RNEMD_exchange_total";
287    rnemd_exchange_total.dataType = "RealType";
288    rnemd_exchange_total.accumulator = new Accumulator();
289    data_[RNEMD_EXCHANGE_TOTAL] = rnemd_exchange_total;
290    statsMap_["RNEMD_EXCHANGE_TOTAL"] =  RNEMD_EXCHANGE_TOTAL;
283  
284      StatsData shadowh;
285      shadowh.units =  "kcal/mol";
# Line 365 | Line 357 | namespace OpenMD {
357        }
358      }
359      
368    if (simParams->getRNEMDParameters()->getUseRNEMD()) {
369      statsMask_.set(RNEMD_EXCHANGE_TOTAL);
370    }
371
372
373
360    }
361  
362    void Stats::parseStatFileFormat(const std::string& format) {
# Line 502 | Line 488 | namespace OpenMD {
488            data_[i].accumulator->add(thermo.getTaggedAtomPairDistance());
489            break;
490            /*
505        case RNEMD_EXCHANGE_TOTAL:
506          data_[i].accumulator->add(thermo.get_RNEMD_exchange_total());
507          break;
491          case SHADOWH:
492            data_[i].accumulator->add(thermo.getShadowHamiltionian());
493            break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines