Changeset a2a2f7 for src


Ignore:
Timestamp:
Apr 29, 2014, 12:42:43 PM (12 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, Candidate_v1.7.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
ae68b5
Parents:
c9db50
git-author:
Frederik Heber <heber@…> (02/01/14 15:42:09)
git-committer:
Frederik Heber <heber@…> (04/29/14 12:42:43)
Message:

Huge warning fix.

  • fixed unused variables.
  • fixed set but unused variables.
  • fixed signed vs. unsigned int comparison.
  • fixed static_warning_test<false, 98> (commented out _IMPLEMENT).
Location:
src
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/ActionSequence.cpp

    rc9db50 ra2a2f7  
    9292// Each action registers itself with the history
    9393void ActionSequence::callAll(){
    94   for (int i=0;i<loop;++i)
     94  for (size_t i=0;i<loop;++i)
    9595    for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
    9696      // we want to have a global bookkeeping for all actions in the sequence, so
    … …  
    105105ActionSequence::stateSet ActionSequence::callAll(bool){
    106106  stateSet states;
    107   for (int i=0;i<loop;++i)
     107  for (size_t i=0;i<loop;++i)
    108108    for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
    109109      // we want to have a global bookkeeping for all actions in the sequence, so

  • src/Actions/SelectionAction/Atoms/AtomByIdAction.cpp

    rc9db50 ra2a2f7  
    6060    AtomMissing
    6161  } status = NoStatus;
     62
    6263  const atomids_t atomids = params.atomids.get();
    6364  atomids_t undoatomids;
    … …  
    9596      break;
    9697  }
     98  return Action::failure;
    9799}
    98100

  • src/Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp

    rc9db50 ra2a2f7  
    6060    AtomMissing
    6161  } status = NoStatus;
     62
    6263  const atomids_t atomids = params.atomids.get();
    6364  atomids_t undoatomids;
    … …  
    9596      break;
    9697  }
     98  return Action::failure;
    9799}
    98100

  • src/Actions/ShapeAction/RemoveShapeAction.cpp

    rc9db50 ra2a2f7  
    7979
    8080ActionState::ptr ShapeRemoveShapeAction::performRedo(ActionState::ptr _state){
    81   ShapeRemoveShapeState *state = assert_cast<ShapeRemoveShapeState*>(_state.get());
     81//  ShapeRemoveShapeState *state = assert_cast<ShapeRemoveShapeState*>(_state.get());
    8282
    8383  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();

  • src/Actions/ShapeAction/StretchShapeAction.cpp

    rc9db50 ra2a2f7  
    9393  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    9494
    95   Vector helper = params.center.get();
    96   helper.ScaleAll(params.stretch.get());
    97   Vector translation = params.center.get() - helper;
     95  Vector helper = state->params.center.get();
     96  helper.ScaleAll(state->params.stretch.get());
     97  Vector translation = state->params.center.get() - helper;
    9898
    9999  for (unsigned int i=0;i<selectedShapes.size();i++){
    100     Shape s = translate(stretch(*selectedShapes[i], params.stretch.get()), translation);
     100    Shape s = translate(stretch(*selectedShapes[i], state->params.stretch.get()), translation);
    101101    std::string name = selectedShapes[i]->getName();
    102102    s.setName(name);

  • src/Analysis/analysis_correlation.cpp

    rc9db50 ra2a2f7  
    332332          atoms_second.begin(), atoms_second.end(),
    333333          intersected_atoms.begin());
    334   const LinkedCell::LinkedList intersected_atoms_set(intersected_atoms.begin(), intersected_atoms.end());
     334  const LinkedCell::LinkedList intersected_atoms_set(intersected_atoms.begin(), intersected_atoms_end);
    335335
    336336  // create map

  • src/Box.cpp

    rc9db50 ra2a2f7  
    229229    dims++;
    230230  } // there are max vectors in total we need to create
    231   const int new_size = pow(2*n+1, dims);
    232   if (internal_list.size() != new_size)
    233     internal_list.resize(new_size);
     231
     232  {
     233    const size_t new_size = pow(2*n+1, dims);
     234    if (internal_list.size() != new_size)
     235      internal_list.resize(new_size);
     236  }
    234237
    235238  if(!dims){

  • src/Filling/Mesh/CubeMesh.cpp

    rc9db50 ra2a2f7  
    103103
    104104  // go over [0,1]^3 filler grid
    105   int n[NDIM];
     105  size_t n[NDIM];
    106106  for (n[0] = 0; n[0] < counts[0]; n[0]++)
    107107    for (n[1] = 0; n[1] < counts[1]; n[1]++)

  • src/Fragmentation/AdaptivityMap.cpp

    rc9db50 ra2a2f7  
    205205      runner != enditer; ++runner) {
    206206    const int No = (*runner).second.first;
    207     const atom *Walker = mol->FindAtom(No);
     207//    const atom *Walker = mol->FindAtom(No);
    208208    LOG(2, "Root " << No << " is already below threshold (10^{" << Order <<"}: " << runner->first << ", setting entry " << No << " of Atom mask to false.");
    209209    AtomMask.setFalse(No);

  • src/Fragmentation/BondsPerShortestPath.cpp

    rc9db50 ra2a2f7  
    133133  // In another picture, the bonds always contain a direction by rightatom being the one more distant from root and hence
    134134  // naturally leftatom forming its predecessor, preventing the BFS"seeker" from continuing in the wrong direction.
    135   int AtomKeyNr = -1;
     135//  int AtomKeyNr = -1;
    136136  atom *Walker = NULL;
    137137  atom *OtherWalker = NULL;
    … …  
    162162      Walker = (*CurrentEdge)->rightatom;    // rightatom is always the one more distant
    163163      Predecessor = (*CurrentEdge)->leftatom;    // ... and leftatom is predecessor
    164       AtomKeyNr = Walker->getNr();
     164//      AtomKeyNr = Walker->getNr();
    165165      LOG(1, "INFO: Current Walker is: " << *Walker << " with nr " << Walker->getNr() << " and SP of " << SP << ", with " << RemainingWalkers << " remaining walkers on this level.");
    166166      // check for new sp level

  • src/Fragmentation/Exporters/ExportGraph.cpp

    rc9db50 ra2a2f7  
    6060  const enum HydrogenSaturation _saturation) :
    6161  TotalGraph(_graph),
    62   CurrentKeySet(TotalGraph.begin()),
    6362  BondFragments(World::getPointer()),
    6463  treatment(_treatment),
    65   saturation(_saturation)
     64  saturation(_saturation),
     65  CurrentKeySet(TotalGraph.begin())
    6666{
    6767}

  • src/Fragmentation/Fragmentation.cpp

    rc9db50 ra2a2f7  
    235235  Info FunctionInfo(__func__);
    236236  std::vector<Graph*> *FragmentLowerOrdersList = NULL;
    237   int NumLevels = 0;
    238   int NumMolecules = 0;
    239   int TotalNumMolecules = 0;
     237  size_t NumLevels = 0;
     238//  size_t NumMolecules = 0;
     239  size_t TotalNumMolecules = 0;
    240240  int *NumMoleculesOfOrder = NULL;
    241241  int Order = 0;
    … …  
    296296      // output resulting number
    297297      LOG(1, "INFO: Number of resulting KeySets is: " << NumMoleculesOfOrder[RootNr] << ".");
    298       if (NumMoleculesOfOrder[RootNr] != 0) {
    299         NumMolecules = 0;
    300       }
     298//      if (NumMoleculesOfOrder[RootNr] != 0) {
     299//        NumMolecules = 0;
     300//      }
    301301      // now, we have completely filled each cell of FragmentLowerOrdersList[] for the current Walker->AdaptiveOrder
    302302      //NumMoleculesOfOrder[Walker->AdaptiveOrder-1] = NumMolecules;
    … …  
    441441  }
    442442  LOG(1, output.str());
     443  return true;
    443444};
    444445

  • src/Fragmentation/Homology/FragmentEdge.cpp

    rc9db50 ra2a2f7  
    124124}
    125125
    126 
    127 // we need to explicitly instantiate the serialization functions
    128 BOOST_CLASS_EXPORT_IMPLEMENT(FragmentEdge)
     126//
     127//// we need to explicitly instantiate the serialization functions
     128//BOOST_CLASS_EXPORT_IMPLEMENT(FragmentEdge)

  • src/Fragmentation/Homology/FragmentNode.cpp

    rc9db50 ra2a2f7  
    108108}
    109109
    110 
    111 // we need to explicitly instantiate the serialization functions
    112 BOOST_CLASS_EXPORT_IMPLEMENT(FragmentNode)
     110//
     111//// we need to explicitly instantiate the serialization functions
     112//BOOST_CLASS_EXPORT_IMPLEMENT(FragmentNode)

  • src/Fragmentation/Homology/HomologyContainer.hpp

    rc9db50 ra2a2f7  
    1919#include <boost/serialization/split_member.hpp>
    2020#include <boost/serialization/vector.hpp>
     21#include <boost/serialization/version.hpp>
    2122
    2223#include <iosfwd>

  • src/Fragmentation/Homology/HomologyGraph.cpp

    rc9db50 ra2a2f7  
    153153}
    154154
    155 // we need to explicitly instantiate the serialization functions
    156 BOOST_CLASS_EXPORT_IMPLEMENT(HomologyGraph)
    157 
     155//
     156//// we need to explicitly instantiate the serialization functions
     157//BOOST_CLASS_EXPORT_IMPLEMENT(HomologyGraph)

  • src/Fragmentation/Homology/unittests/stubs/FragmentStub.cpp

    rc9db50 ra2a2f7  
    126126//  static bool Fragment::isPositionEqual(const position_t &a, const position_t &b);
    127127
    128 // we need to explicitly instantiate the serialization functions
    129 BOOST_CLASS_EXPORT_IMPLEMENT(Fragment)
     128//
     129//// we need to explicitly instantiate the serialization functions
     130//BOOST_CLASS_EXPORT_IMPLEMENT(Fragment)
    130131
    131132/** Equality operator for two nuclei.

  • src/Fragmentation/Summation/Containers/FragmentationResultContainer.hpp

    rc9db50 ra2a2f7  
    1515
    1616#include <boost/serialization/access.hpp>
     17#include <boost/serialization/map.hpp>
     18#include <boost/serialization/split_member.hpp>
     19#include <boost/serialization/version.hpp>
    1720#include "CodePatterns/Singleton.hpp"
    1821
    … …  
    167170  // serialization
    168171  template <typename Archive>
    169   void serialize(Archive& ar, const unsigned int version)
     172  void load(Archive& ar, const unsigned int version)
     173  {
     174    OBSERVE;
     175    ar & ResultsType;
     176    ar & keysets;
     177    ar & forcekeysets;
     178    ar & shortrangedata;
     179    if (version > 0)
     180      ar & cycles;
     181    if (version > 1)
     182      ar & summedshortrange;
     183#ifdef HAVE_VMG
     184    ar & longrangedata;
     185#endif
     186  }
     187  template <typename Archive>
     188  void save(Archive& ar, const unsigned int version) const
    170189  {
    171190    ar & ResultsType;
    … …  
    181200#endif
    182201  }
     202  BOOST_SERIALIZATION_SPLIT_MEMBER()
    183203};
    184204

  • src/Fragmentation/Summation/Containers/MPQCData.hpp

    rc9db50 ra2a2f7  
    1616#include <boost/serialization/access.hpp>
    1717#include <boost/serialization/vector.hpp>
     18#include <boost/serialization/version.hpp>
    1819
    1920#include <iosfwd>

  • src/Fragmentation/Summation/IndexSetContainer.cpp

    rc9db50 ra2a2f7  
    7070    for(IndexSet::const_iterator keyiter = (*iter).begin();
    7171        keyiter != (*iter).end(); ++keyiter) {
    72       if (*keyiter != -1)
     72      if (*keyiter != (size_t)-1)
    7373        _AllIndices->insert((Index_t)*keyiter);
    7474    }
    … …  
    8686    for(IndexSet::const_iterator keyiter = (*iter)->begin();
    8787        keyiter != (*iter)->end(); ++keyiter) {
    88       if (*keyiter != -1)
     88      if (*keyiter != (size_t)-1)
    8989        _AllIndices->insert((Index_t)*keyiter);
    9090    }

  • src/Fragmentation/Summation/SetValues/Fragment.cpp

    rc9db50 ra2a2f7  
    195195}
    196196
    197 
    198 // we need to explicitly instantiate the serialization functions
    199 BOOST_CLASS_EXPORT_IMPLEMENT(Fragment)
     197// below is not needed as we have above static ZeroInstace instantiating the code
     198
     199//// we need to explicitly instantiate the serialization functions
     200//BOOST_CLASS_EXPORT_IMPLEMENT(Fragment)

  • src/Fragmentation/Summation/SetValues/unittests/EigenvaluesUnitTest.cpp

    rc9db50 ra2a2f7  
    170170    const size_t othersubtractedsize = otherev.subtractedsamples.size();
    171171    const size_t addedsize = ev->addedsamples.size();
    172     const size_t subtractedsize = ev->subtractedsamples.size();
     172//    const size_t subtractedsize = ev->subtractedsamples.size();
    173173    *ev -= otherev;
    174174    // otherev did not change
    … …  
    193193    const size_t othersubtractedsize = otherev.subtractedsamples.size();
    194194    const size_t addedsize = ev->addedsamples.size();
    195     const size_t subtractedsize = ev->subtractedsamples.size();
     195//    const size_t subtractedsize = ev->subtractedsamples.size();
    196196    *ev -= otherev;
    197197    // otherev did not change

  • src/Fragmentation/fragmentation_helpers.cpp

    rc9db50 ra2a2f7  
    9292  int StartNr = 0;
    9393  int counter = 0;
    94   int NumLevels = 0;
     94  size_t NumLevels = 0;
    9595  atom *Walker = NULL;
    9696
    … …  
    106106    ASSERT( NumLevels == FragmentLowerOrdersList[RootNr].size(),
    107107        "CombineAllOrderListIntoOne() - differing size and NumLevels.");
    108     for(int i=0;i<NumLevels;i++) {
     108    for(size_t i=0;i<NumLevels;i++) {
    109109      if (FragmentLowerOrdersList[RootNr][i] != NULL) {
    110110        FragmentList.InsertGraph((*FragmentLowerOrdersList[RootNr][i]), counter);

  • src/FunctionApproximation/Extractors.cpp

    rc9db50 ra2a2f7  
    684684          if (arg.indices.first == *firstindex) {
    685685            if ((arg.indices.second == *secondindex) || (*secondindex == (size_t)-1)) {
    686               if (*secondindex == -1)
     686              if (*secondindex == (size_t)-1)
    687687                *secondindex = arg.indices.second;
    688688              argumentbunch.push_back(arg);

  • src/FunctionApproximation/FunctionApproximation.cpp

    rc9db50 ra2a2f7  
    185185      double *lb = new double[m];
    186186      double *ub = new double[m];
    187       for (size_t i=0;i<m;++i) {
     187      for (size_t i=0;i<(size_t)m;++i) {
    188188        lb[i] = lowerbound[i];
    189189        ub[i] = upperbound[i];

  • src/Jobs/MPQCJob.cpp

    rc9db50 ra2a2f7  
    5757  FragmentJob(_JobId),
    5858  DoLongrange(MPQCData::DontSampleDensity),
     59  DoValenceOnly(MPQCData::DoSampleValenceOnly),
    5960  inputfile(_inputfile),
    6061  grid(_begin, _end, _level)
    … …  
    6667MPQCJob::MPQCJob() :
    6768  FragmentJob(JobId::IllegalJob),
    68   DoLongrange(MPQCData::DontSampleDensity)
     69  DoLongrange(MPQCData::DontSampleDensity),
     70  DoValenceOnly(MPQCData::DoSampleValenceOnly)
    6971{}
    7072

  • src/Jobs/WindowGrid_converter.cpp

    rc9db50 ra2a2f7  
    109109  const VMG::Index size = grid.Local().Size();
    110110  if (OpenBoundaryConditions)
    111     for(N[0]=0; N[0] < size[0]/4; ++N[0])
    112       for(N[1]=0; N[1] < size[1]; ++N[1])
    113         for(N[2]=0; N[2] < size[2]; ++N[2]) {
    114           ASSERT( copyiter != grid.Iterators().Local().End(),
    115               "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
    116           ++copyiter;
    117         }
    118   for(N[0]=0; N[0] < length[0]; ++N[0]) {
     111    for(N[0]=(size_t)0; N[0] < (size_t)size[0]/(size_t)4; ++N[0])
     112      for(N[1]=(size_t)0; N[1] < (size_t)size[1]; ++N[1])
     113        for(N[2]=(size_t)0; N[2] < (size_t)size[2]; ++N[2]) {
     114          ASSERT( copyiter != grid.Iterators().Local().End(),
     115              "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
     116          ++copyiter;
     117        }
     118  for(N[0]=(size_t)0; N[0] < length[0]; ++N[0]) {
    119119    std::advance(griditer, pre_offset[1]*total[2]);
    120120    if (OpenBoundaryConditions)
    121       for(N[1]=0; N[1] < size[1]/4; ++N[1])
    122         for(N[2]=0; N[2] < size[2]; ++N[2]) {
    123           ASSERT( copyiter != grid.Iterators().Local().End(),
    124               "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
    125           ++copyiter;
    126         }
    127     for(N[1]=0; N[1] < length[1]; ++N[1]) {
     121      for(N[1]=(size_t)0; N[1] < (size_t)size[1]/(size_t)4; ++N[1])
     122        for(N[2]=(size_t)0; N[2] < (size_t)size[2]; ++N[2]) {
     123          ASSERT( copyiter != grid.Iterators().Local().End(),
     124              "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
     125          ++copyiter;
     126        }
     127    for(N[1]=(size_t)0; N[1] < length[1]; ++N[1]) {
    128128      std::advance(griditer, pre_offset[2]);
    129129      if (OpenBoundaryConditions)
    130         for(N[2]=0; N[2] < size[2]/4; ++N[2]) {
    131           ASSERT( copyiter != grid.Iterators().Local().End(),
    132               "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
    133           ++copyiter;
    134         }
    135       for(N[2]=0; N[2] < length[2]; ++N[2]) {
     130        for(N[2]=(size_t)0; N[2] < (size_t)size[2]/(size_t)4; ++N[2]) {
     131          ASSERT( copyiter != grid.Iterators().Local().End(),
     132              "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
     133          ++copyiter;
     134        }
     135      for(N[2]=(size_t)0; N[2] < length[2]; ++N[2]) {
    136136        ASSERT( griditer != window.sampled_grid.end(),
    137137            "InterfaceVMGJob::addGridOntoWindow() - griditer is already at end of window.");
    … …  
    142142      std::advance(griditer, post_offset[2]);
    143143      if (OpenBoundaryConditions)
    144         for(N[2]=0; N[2] < size[2] - size[2]/4 - length[2]; ++N[2]) {
     144        for(N[2]=(size_t)0; N[2] < (size_t)size[2] - (size_t)size[2]/(size_t)4 - length[2]; ++N[2]) {
    145145          ASSERT( copyiter != grid.Iterators().Local().End(),
    146146              "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
    … …  
    150150    std::advance(griditer, post_offset[1]*total[2]);
    151151    if (OpenBoundaryConditions)
    152       for(N[1]=0; N[1] < size[1] - size[1]/4 - length[1]; ++N[1])
    153         for(N[2]=0; N[2] < size[2]; ++N[2]) {
     152      for(N[1]=(size_t)0; N[1] < (size_t)size[1] - (size_t)size[1]/(size_t)4 - length[1]; ++N[1])
     153        for(N[2]=(size_t)0; N[2] < (size_t)size[2]; ++N[2]) {
    154154          ASSERT( copyiter != grid.Iterators().Local().End(),
    155155              "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
    … …  
    158158  }
    159159  if (OpenBoundaryConditions)
    160     for(N[0]=0; N[0] < size[0] - size[0]/4 - length[0]; ++N[0])
    161       for(N[1]=0; N[1] < size[1]; ++N[1])
    162         for(N[2]=0; N[2] < size[2]; ++N[2]) {
     160    for(N[0]=(size_t)0; N[0] < (size_t)size[0] - (size_t)size[0]/(size_t)4 - length[0]; ++N[0])
     161      for(N[1]=(size_t)0; N[1] < (size_t)size[1]; ++N[1])
     162        for(N[2]=(size_t)0; N[2] < (size_t)size[2]; ++N[2]) {
    163163          ASSERT( copyiter != grid.Iterators().Local().End(),
    164164              "InterfaceVMGJob::addGridOntoWindow() - copyiter is already at end of window.");
    … …  
    230230  if (OpenBoundaryConditions) {
    231231    const VMG::Index size = window.Local().Size();
    232     const VMG::Index boundary1size = window.Local().BoundarySize1();
    233     const VMG::Index boundary2size = window.Local().BoundarySize2();
    234     const VMG::Index halo1size = window.Local().HaloSize1();
    235     const VMG::Index halo2size = window.Local().HaloSize2();
     232//    const VMG::Index boundary1size = window.Local().BoundarySize1();
     233//    const VMG::Index boundary2size = window.Local().BoundarySize2();
     234//    const VMG::Index halo1size = window.Local().HaloSize1();
     235//    const VMG::Index halo2size = window.Local().HaloSize2();
    236236    // this mimicks VMG::GridIndexTranslations::EndOffset()
    237237    const size_t off = OpenBoundaryConditions ? 1 : 0;
    238238    for (size_t i=0;i<3;++i)
    239       pre_offset[i] += (size[i] - off) / 4;
     239      pre_offset[i] += ((size_t)size[i] - off) / 4;
    240240    for (size_t i=0;i<3;++i)
    241       total[i] = (size[i]);
     241      total[i] = ((size_t)size[i]);
    242242    for (size_t i=0;i<3;++i)
    243       post_offset[i] = (size[i]) - pre_offset[i] - length[i];
     243      post_offset[i] = ((size_t)size[i]) - pre_offset[i] - length[i];
    244244  }
    245245

  • src/Parameters/Validators/Specific/TimeStepPresentValidator.cpp

    rc9db50 ra2a2f7  
    4646  std::vector<atom*> AllAtoms = World::getInstance().getAllAtoms();
    4747  for(std::vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner) {
    48     int size = (dynamic_cast<AtomInfo *>(*AtomRunner))->getTrajectorySize();
    49     if (size > maxTime)
    50       maxTime = size;
     48    size_t sizeTrajectory = (dynamic_cast<AtomInfo *>(*AtomRunner))->getTrajectorySize();
     49    if (sizeTrajectory > maxTime)
     50      maxTime = sizeTrajectory;
    5151  }
    5252

  • src/Potentials/Specifics/FourBodyPotential_Torsion.cpp

    rc9db50 ra2a2f7  
    218218      break;
    219219  }
     220  return std::vector<result_t>(1);
    220221}
    221222

  • src/Potentials/Specifics/ThreeBodyPotential_Angle.cpp

    rc9db50 ra2a2f7  
    205205      break;
    206206  }
     207  return std::vector<result_t>(1);
    207208}
    208209

  • src/Shapes/BaseShapes.cpp

    rc9db50 ra2a2f7  
    297297    // The curve is then parametrized by arch length and evaluated in constant intervals.
    298298    double a = sqrt(N) * 2;
    299     for (int i=0; i<N; i++){
     299    for (size_t i=0; i<N; ++i){
    300300      double t0 = ((double)i + 0.5) / (double)N;
    301301      double t = (sqrt(t0) - sqrt(1.0 - t0) + 1.0) / 2.0 * M_PI;
    … …  
    314314    double a=4*M_PI/N;
    315315    double d= sqrt(a);
    316     int Mtheta=int(M_PI/d);
     316    size_t Mtheta=round(M_PI/d);
    317317    double dtheta=M_PI/Mtheta;
    318318    double dphi=a/dtheta;
    319     for (int m=0; m<Mtheta; m++)
     319    for (size_t m=0; m<Mtheta; ++m)
    320320    {
    321321      double theta=M_PI*(m+0.5)/Mtheta;
    322       int Mphi=int(2*M_PI*sin(theta)/dphi);
    323       for (int n=0; n<Mphi;n++)
     322      size_t Mphi=round(2*M_PI*sin(theta)/dphi);
     323      for (size_t n=0; n<Mphi;++n)
    324324      {
    325325        double phi= 2*M_PI*n/Mphi;

  • src/Tesselation/boundary.cpp

    rc9db50 ra2a2f7  
    12781278  // Center filler at origin
    12791279  filler->CenterEdge(&Inserter);
    1280   const int FillerCount = filler->getAtomCount();
     1280//  const int FillerCount = filler->getAtomCount();
    12811281  LOG(2, "INFO: Filler molecule has the following bonds:");
    12821282  for(molecule::iterator AtomRunner = filler->begin(); AtomRunner != filler->end(); ++AtomRunner) {
    … …  
    12901290  }
    12911291
    1292   atom * CopyAtoms[FillerCount];
     1292//  atom * CopyAtoms[FillerCount];
    12931293
    12941294  setVerbosity(4);
    … …  
    14451445  CandidateForTesselation *baseline = NULL;
    14461446  bool OneLoopWithoutSuccessFlag = true;  // marks whether we went once through all baselines without finding any without two triangles
    1447   bool TesselationFailFlag = false;
     1447//  bool TesselationFailFlag = false;
    14481448
    14491449  mol->getAtomCount();
    … …  
    14861486
    14871487    // 2b. find best candidate for each OpenLine
    1488     TesselationFailFlag = TesselStruct->FindCandidatesforOpenLines(RADIUS, LCList);
     1488    const bool TesselationFailFlag = TesselStruct->FindCandidatesforOpenLines(RADIUS, LCList);
     1489    ASSERT( TesselationFailFlag,
     1490        "FindNonConvexBorder() - at least one open line without candidate exists.");
    14891491
    14901492    // 2c. print OpenLines with candidates again

  • src/Tesselation/tesselation.cpp

    rc9db50 ra2a2f7  
    120120  BoundaryTriangleSet *T = NULL;
    121121  bool OneLoopWithoutSuccessFlag = true;
    122   bool TesselationFailFlag = false;
    123122  while ((!OpenLines.empty()) && (OneLoopWithoutSuccessFlag)) {
    124123    // 2a. fill all new OpenLines
    … …  
    128127        T = (((baseline->BaseLine->triangles.begin()))->second);
    129128        //the line is there, so there is a triangle, but only one.
    130         TesselationFailFlag = FindNextSuitableTriangle(*baseline, *T, SPHERERADIUS, LinkedList);
     129        const bool TesselationFailFlag = FindNextSuitableTriangle(*baseline, *T, SPHERERADIUS, LinkedList);
     130        ASSERT( TesselationFailFlag,
     131            "Tesselation::operator() - no suitable candidate triangle found.");
    131132      }
    132133    }
    … …  
    13991400 * @param N number of found triangles
    14001401 * @param *LC LinkedCell_deprecated structure with neighbouring points
     1402 * @return false - no suitable candidate found
    14011403 */
    14021404bool Tesselation::FindNextSuitableTriangle(CandidateForTesselation &CandidateLine, const BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell_deprecated *LC)
    … …  
    32233225  list<TesselPointList *>::iterator ListAdvance = ListOfClosedPaths->begin();
    32243226  list<TesselPointList *>::iterator ListRunner = ListAdvance;
    3225   TriangleMap::iterator NumberRunner = Candidates.begin();
     3227//  TriangleMap::iterator NumberRunner = Candidates.begin();
    32263228  TesselPointList::iterator StartNode, MiddleNode, EndNode;
    32273229  double angle;
    … …  
    36373639      // check whether we have to fix lines
    36383640      BoundaryTriangleSet *Othertriangle = NULL;
    3639       BoundaryTriangleSet *OtherpartnerTriangle = NULL;
     3641//      BoundaryTriangleSet *OtherpartnerTriangle = NULL;
    36403642      TriangleMap::iterator TriangleRunner;
    36413643      for (int i = 0; i < 3; ++i)
    … …  
    36483650              }
    36493651            for (TriangleRunner = partnerTriangle->lines[i]->triangles.begin(); TriangleRunner != partnerTriangle->lines[i]->triangles.end(); ++TriangleRunner)
    3650               if (TriangleRunner->second != partnerTriangle) {
    3651                 OtherpartnerTriangle = TriangleRunner->second;
    3652               }
     3652//              if (TriangleRunner->second != partnerTriangle) {
     3653//                OtherpartnerTriangle = TriangleRunner->second;
     3654//              }
    36533655            /// interchanges their lines so that triangle->lines[i] == partnerTriangle->lines[j]
    36543656            // the line of triangle receives the degenerated ones

  • src/Tesselation/tesselationhelpers.cpp

    rc9db50 ra2a2f7  
    430430  TesselPoint* secondClosestPoint = NULL;
    431431  double distance = 1e16;
    432   double secondDistance = 1e16;
     432//  double secondDistance = 1e16;
    433433  Vector helper;
    434434  int N[NDIM], Nlower[NDIM], Nupper[NDIM];
    … …  
    451451            if (currentNorm < distance) {
    452452              // remember second point
    453               secondDistance = distance;
     453//              secondDistance = distance;
    454454              secondClosestPoint = closestPoint;
    455455              // mark down new closest point

  • src/UIElements/Qt4/Query/QtQueryList.hpp

    rc9db50 ra2a2f7  
    9292    removeSelectedRows(rows);
    9393    for (int i = rows.size() - 1; i >= 0; i --){
    94       ASSERT(rows[i] < tempRef.size(), "QtQueryList<T>::removeElements() trying to remove invalid element.");
     94      ASSERT((size_t)(rows[i]) < tempRef.size(), "QtQueryList<T>::removeElements() trying to remove invalid element.");
    9595      tempRef.erase(tempRef.begin() + rows[i]);
    9696    }

  • src/UIElements/Qt4/Query/VectorQtQuery.cpp

    rc9db50 ra2a2f7  
    5757  subLayout = new QVBoxLayout();
    5858  mainLayout->addLayout(subLayout);
    59   QComboBox* inputBox = new QComboBox();
     59//  QComboBox* inputBox = new QComboBox();
    6060  coordLayout = new QHBoxLayout();
    6161  subLayout->addLayout(coordLayout);

  • src/UIElements/Views/Qt4/Plotting/QSeisPlotPage.cpp

    rc9db50 ra2a2f7  
    5656void QSeisPlotPage::addCurve(std::string name)
    5757{
    58     QSeisPlotCurve *curve;
    59     QListWidgetCurveItem *item;
    60     curve = QSeisCurveRegistry::getInstance().getByName(name);
    61 
    62     item = new QListWidgetCurveItem();
     58    QSeisPlotCurve *curve = QSeisCurveRegistry::getInstance().getByName(name);
     59    QListWidgetCurveItem *item = new QListWidgetCurveItem();
    6360    item->curveName = curve->getName();
    6461    item->setText(curve->getDisplayName());
    … …  
    7471void QSeisPlotPage::updateCurve(std::string name)
    7572{
    76     QSeisPlotCurve *curve;
    77     curve = QSeisCurveRegistry::getInstance().getByName(name);
     73    QSeisPlotCurve *curve = QSeisCurveRegistry::getInstance().getByName(name);
    7874    if (curve->plot() != NULL)
    7975        curve->plot()->replot();
    … …  
    8278void QSeisPlotPage::removeCurve(std::string name)
    8379{
    84     QSeisPlotCurve *curve;
    85     QListWidgetCurveItem *item;
    86     curve = QSeisCurveRegistry::getInstance().getByName(name);
     80//    QSeisPlotCurve *curve = QSeisCurveRegistry::getInstance().getByName(name);
    8781
    8882    for (int i = 0; i < curveList->count(); i++)
    8983    {
    90         item = (QListWidgetCurveItem *)curveList->item(i);
     84      QListWidgetCurveItem *item = (QListWidgetCurveItem *)curveList->item(i);
    9185        if (item->curveName == name)
    9286        {
    … …  
    10195{
    10296    QListWidgetCurveItem *curveItem = (QListWidgetCurveItem *)item;
    103     QSeisPlotCurve *curve;
    104     curve = QSeisCurveRegistry::getInstance().getByName(curveItem->curveName);
     97    QSeisPlotCurve *curve = QSeisCurveRegistry::getInstance().getByName(curveItem->curveName);
    10598
    10699    if (curveItem->checkState() == Qt::Unchecked)

  • src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.cpp

    rc9db50 ra2a2f7  
    9090void GLMoleculeObject_molecule::update(Observable *publisher)
    9191{
     92#ifdef LOG_OBSERVER
    9293  const molecule *_mol = static_cast<molecule *>(publisher);
    93 #ifdef LOG_OBSERVER
    94   observerLog().addMessage() << "++ Update of Observer " << observerLog().getName(static_cast<Observer *>(this)) << " from molecule "+toString(_molecule->getId())+".";
     94  observerLog().addMessage() << "++ Update of Observer " << observerLog().getName(static_cast<Observer *>(this)) << " from molecule "+toString(_mol->getId())+".";
    9595#endif
    9696}

  • src/UIElements/Views/Qt4/QtTimeLine.cpp

    rc9db50 ra2a2f7  
    4949    QSlider (Qt::Horizontal, _parent),
    5050    Observer("QtTimeLine"),
    51     worldtime_enlisted(false),
    52     atomobserver_enlisted(false)
     51    atomobserver_enlisted(false),
     52    worldtime_enlisted(false)
    5353{
    5454  // set initial values
    … …  
    106106      QSlider::setMaximum(MaxTrajectory);
    107107  } else if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
    108     const unsigned int timestep = WorldTime::getTime();
     108    const int timestep = WorldTime::getTime();
    109109    // check whether we are beyond maximum
    110110    if (timestep > QSlider::maximum())
Note: See TracChangeset for help on using the changeset viewer.