Changeset e58835d for src


Ignore:
Timestamp:
Apr 15, 2013, 9:43:05 PM (13 years ago)
Author:
Julian Iseringhausen <isering@…>
Children:
d6a338
Parents:
dc7dc9
Message:

Renamed GlobalIndices::GlobalSizeNew back to GlobalIndices::GlobalSize.

Location:
src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • src/base/interface.cpp

    rdc7dc9 re58835d  
    6161     //TODO: Change this to max_boundary_nodes at one point
    6262     while (global.size() == 0 ||
    63          (bc[0] == Open && global.back().GlobalSizeNew()[0] > Helper::intpow(2, levelMin)+1) ||
    64          (bc[1] == Open && global.back().GlobalSizeNew()[1] > Helper::intpow(2, levelMin)+1) ||
    65          (bc[2] == Open && global.back().GlobalSizeNew()[2] > Helper::intpow(2, levelMin)+1)) {
     63         (bc[0] == Open && global.back().GlobalSize()[0] > Helper::intpow(2, levelMin)+1) ||
     64         (bc[1] == Open && global.back().GlobalSize()[1] > Helper::intpow(2, levelMin)+1) ||
     65         (bc[2] == Open && global.back().GlobalSize()[2] > Helper::intpow(2, levelMin)+1)) {
    6666
    6767       global.push_back(GlobalIndices());
    … …  
    8282       global.back().LocalEnd() = (num_cells + inner_boundary) / 2 + add_node;
    8383
    84        global.back().GlobalSizeNew() = global.back().LocalSize();
     84       global.back().GlobalSize() = global.back().LocalSize();
    8585       global.back().GlobalBegin() = global.back().LocalBegin();
    8686       global.back().GlobalEnd() = global.back().LocalEnd();
    … …  
    112112     global.back().LocalEnd() = num_cells/2 + add_node;
    113113
    114      global.back().GlobalSizeNew() = global.back().LocalSize();
     114     global.back().GlobalSize() = global.back().LocalSize();
    115115     global.back().GlobalBegin() = global.back().LocalBegin();
    116116     global.back().GlobalEnd() = global.back().LocalEnd();
    … …  
    124124   }
    125125
    126    while (global.back().GlobalSizeNew().Min() > Helper::intpow(2, levelMin)+1) {
     126   while (global.back().GlobalSize().Min() > Helper::intpow(2, levelMin)+1) {
    127127
    128128     num_cells /= 2;
    … …  
    140140     global.back().LocalEnd() = num_cells/2 + add_node;
    141141
    142      global.back().GlobalSizeNew() = global.back().LocalSize();
     142     global.back().GlobalSize() = global.back().LocalSize();
    143143     global.back().GlobalBegin() = global.back().LocalBegin();
    144144     global.back().GlobalEnd() = global.back().LocalEnd();

  • src/comm/comm_mpi.cpp

    rdc7dc9 re58835d  
    487487          << "    GLOBAL_BEGIN:            " << grid.Global().GlobalBegin() << std::endl
    488488          << "    GLOBAL_END:              " << grid.Global().GlobalEnd() << std::endl
    489           << "    GLOBAL_SIZE:             " << grid.Global().GlobalSizeNew() << std::endl
     489          << "    GLOBAL_SIZE:             " << grid.Global().GlobalSize() << std::endl
    490490          << "    GLOBAL_BEGIN_FINEST:     " << grid.Global().GlobalBeginFinest() << std::endl
    491491          << "    GLOBAL_END_FINEST:       " << grid.Global().GlobalEndFinest() << std::endl

  • src/comm/comm_serial.cpp

    rdc7dc9 re58835d  
    329329        << "  GLOBAL_BEGIN:        " << (*mg)(i).Global().GlobalBegin() << std::endl
    330330        << "  GLOBAL_END:          " << (*mg)(i).Global().GlobalEnd() << std::endl
    331         << "  GLOBAL_SIZE:         " << (*mg)(i).Global().GlobalSizeNew() << std::endl
     331        << "  GLOBAL_SIZE:         " << (*mg)(i).Global().GlobalSize() << std::endl
    332332        << "  GLOBAL_BEGIN_FINEST: " << (*mg)(i).Global().GlobalBeginFinest() << std::endl
    333333        << "  GLOBAL_END_FINEST:   " << (*mg)(i).Global().GlobalEndFinest() << std::endl

  • src/comm/domain_decomposition_mpi.cpp

    rdc7dc9 re58835d  
    5151    global_l = interface->Global()[i];
    5252
    53     if (IsActive(comm, global_l.GlobalSizeNew(), procs)) {
     53    if (IsActive(comm, global_l.GlobalSize(), procs)) {
    5454
    5555      if (i == 0) {
    5656
    57         remainder = global_l.GlobalSizeNew() % procs;
     57        remainder = global_l.GlobalSize() % procs;
    5858
    59         global_l.LocalSize() = global_l.GlobalSizeNew() / procs;
     59        global_l.LocalSize() = global_l.GlobalSize() / procs;
    6060        for (int j=0; j<3; ++j)
    6161          if (comm->GlobalPos()[j] < remainder[j])
    … …  
    8989          } else {
    9090
    91             remainder[j] = global_l.GlobalSizeNew()[j] % procs[j];
     91            remainder[j] = global_l.GlobalSize()[j] % procs[j];
    9292
    93             global_l.LocalSize()[j] = global_l.GlobalSizeNew()[j] / procs[j];
     93            global_l.LocalSize()[j] = global_l.GlobalSize()[j] / procs[j];
    9494            if (comm->GlobalPos()[j] < remainder[j])
    9595              ++(global_l.LocalSize()[j]);

  • src/grid/grid.cpp

    rdc7dc9 re58835d  
    126126    avg += GetVal(*iter);
    127127
    128   avg = MG::GetComm()->GlobalSum(avg) / Global().GlobalSizeNew().Product();
     128  avg = MG::GetComm()->GlobalSum(avg) / Global().GlobalSize().Product();
    129129
    130130  MG::GetComm()->PrintOnce(Info, "Global constraint enforcement: %e", avg);
    … …  
    143143    val += GetVal(*iter);
    144144
    145   val = MG::GetComm()->GlobalSum(val) / Global().GlobalSizeNew().Product();
     145  val = MG::GetComm()->GlobalSum(val) / Global().GlobalSize().Product();
    146146
    147147  if (std::abs(val) > std::numeric_limits<vmg_float>::epsilon()) {

  • src/grid/grid.hpp

    rdc7dc9 re58835d  
    186186{
    187187  return z - global.GlobalBegin().X()
    188     + global.GlobalSizeNew().Z() * (y - global.GlobalBegin().Y()
    189     + global.GlobalSizeNew().Y() * (x - global.GlobalBegin().X()));
     188    + global.GlobalSize().Z() * (y - global.GlobalBegin().Y()
     189    + global.GlobalSize().Y() * (x - global.GlobalBegin().X()));
    190190}
    191191

  • src/grid/grid_properties.hpp

    rdc7dc9 re58835d  
    6363  Index& GlobalBegin() {return global_begin;}
    6464  Index& GlobalEnd() {return global_end;}
    65   Index& GlobalSizeNew() {return global_size;}
     65  Index& GlobalSize() {return global_size;}
    6666
    6767  const Index& GlobalBegin() const {return global_begin;}
    6868  const Index& GlobalEnd() const {return global_end;}
    69   const Index& GlobalSizeNew() const {return global_size;}
     69  const Index& GlobalSize() const {return global_size;}
    7070
    7171  Index& GlobalBeginFinest() {return global_begin_finest;}

  • src/grid/is_grid.hpp

    rdc7dc9 re58835d  
    171171inline int IsGrid<T>::GlobalLinearIndex(int x, int y, int z) const
    172172{
    173   return z + global.GlobalSizeNew().Z() * (y + global.GlobalSizeNew().Y() * x);
     173  return z + global.GlobalSize().Z() * (y + global.GlobalSize().Y() * x);
    174174}
    175175
    … …  
    177177inline int IsGrid<T>::GlobalLinearIndex(const Index& index) const
    178178{
    179   return index.Z() + global.GlobalSizeNew().Z() * (index.Y() + global.GlobalSizeNew().Y() * index.X());
     179  return index.Z() + global.GlobalSize().Z() * (index.Y() + global.GlobalSize().Y() * index.X());
    180180}
    181181

  • src/grid/tempgrid.cpp

    rdc7dc9 re58835d  
    6767  global.GlobalBegin() = 0;
    6868  global.GlobalEnd() = size;
    69   global.GlobalSizeNew() = size;
     69  global.GlobalSize() = size;
    7070  global.GlobalBeginFinest() = 0;
    7171  global.GlobalEndFinest() = size;
    … …  
    113113  global.GlobalBegin() = grid_finer.Global().GlobalBegin();
    114114  global.GlobalEnd() = grid_finer.Global().GlobalEnd();
    115   global.GlobalSizeNew() = grid_finer.Global().GlobalSizeNew();
     115  global.GlobalSize() = grid_finer.Global().GlobalSize();
    116116
    117117  global.GlobalBeginFinest() = grid_finer.Global().GlobalBeginFinest();
    … …  
    202202  global.GlobalBegin() = grid.Global().GlobalBegin();
    203203  global.GlobalEnd() = grid.Global().GlobalEnd();
    204   global.GlobalSizeNew() = grid.Global().GlobalSizeNew();
     204  global.GlobalSize() = grid.Global().GlobalSize();
    205205
    206206  global.GlobalBeginFinest() = grid.Global().GlobalBeginFinest();

  • src/solver/solver.cpp

    rdc7dc9 re58835d  
    7070void Solver::Realloc(Grid& sol)
    7171{
    72   this->Realloc(sol.Global().GlobalSizeNew().Product());
     72  this->Realloc(sol.Global().GlobalSize().Product());
    7373}

  • src/solver/solver_regular.cpp

    rdc7dc9 re58835d  
    5656#endif
    5757
    58   this->Realloc(rhs.Global().GlobalSizeNew().Product());
     58  this->Realloc(rhs.Global().GlobalSize().Product());
    5959
    6060  for (grid_iter = rhs.Iterators().Local().Begin(); grid_iter != rhs.Iterators().Local().End(); ++grid_iter) {

  • src/solver/solver_singular.cpp

    rdc7dc9 re58835d  
    6060
    6161  // Make sure that arrays are big enough to hold expanded system of equations
    62   this->Realloc(rhs.Global().GlobalSizeNew().Product() + 1);
     62  this->Realloc(rhs.Global().GlobalSize().Product() + 1);
    6363
    6464  for (grid_iter = rhs.Iterators().Local().Begin(); grid_iter != rhs.Iterators().Local().End(); ++grid_iter) {
    … …  
    8787        if (comm->BoundaryConditions()[j] == Periodic) {
    8888          if (i[j] < rhs.Global().GlobalBegin()[j])
    89             i[j] += rhs.Global().GlobalSizeNew()[j];
     89            i[j] += rhs.Global().GlobalSize()[j];
    9090          else if (i[j] >= rhs.Global().GlobalEnd()[j])
    91             i[j] -= rhs.Global().GlobalSizeNew()[j];
     91            i[j] -= rhs.Global().GlobalSize()[j];
    9292        }
    9393
    … …  
    137137                                      sol.Global().LocalBegin().Z() + k);
    138138
    139         assert(index >= 0 && index < sol.Global().GlobalSizeNew().Product());
     139        assert(index >= 0 && index < sol.Global().GlobalSize().Product());
    140140
    141141        // Set solution
Note: See TracChangeset for help on using the changeset viewer.