Changeset cd0fed

Timestamp:

May 10, 2012, 12:22:46 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

06e153

Parents:

ae05b4

Message:

Fixed some warnings.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1804 5161e1c8-67bf-11de-9fd5-51895aff932f

Location:

src

Files:

• base/command_list.cpp (modified) (3 diffs)
• comm/mpi/datatype.cpp (modified) (2 diffs)
• comm/mpi/settings.cpp (modified) (1 diff)
• level/level_operator_cs.cpp (modified) (2 diffs)
• level/level_operator_fas.cpp (modified) (1 diff)
• units/particle/bspline.hpp (modified) (1 diff)
• units/particle/comm_mpi_particle.cpp (modified) (2 diffs)
• units/particle/interface_particles.cpp (modified) (2 diffs)
• units/particle/interpolation.cpp (modified) (4 diffs)
• units/particle/interpolation.hpp (modified) (2 diffs)

src/base/command_list.cpp

@@ -35 +35 @@
   Request request;
   Request final_request = (commands.size() == 0 ? StopCycleNow : Continue);
-  Comm* comm = MG::GetComm();
 
   for (CommandList::iterator iter=commands.begin(); iter!=commands.end(); ++iter) {
@@ -48 +47 @@
     MPI_Barrier(MPI_COMM_WORLD);
 #endif
-    comm->PrintStringOnce("Command \"%s\" start", iter->first.c_str());
+    MG::GetComm()->PrintStringOnce("Command \"%s\" start", iter->first.c_str());
 #endif
 
@@ -59 +58 @@
     MPI_Barrier(MPI_COMM_WORLD);
 #endif
-    comm->PrintStringOnce("Command \"%s\" done", iter->first.c_str());
+    MG::GetComm()->PrintStringOnce("Command \"%s\" done", iter->first.c_str());
 #endif
 

src/comm/mpi/datatype.cpp

@@ -67 +67 @@
 
     Index i;
-    int c = 0;
+    unsigned int c = 0;
     const Index end = _starts + _subsizes;
     const size_t memcpy_size = _subsizes.Z() * sizeof(vmg_float);
@@ -100 +100 @@
 
     Index i;
-    int c = 0;
+    unsigned int c = 0;
     const Index end = _starts + _subsizes;
     const size_t memcpy_size = _subsizes.Z() * sizeof(vmg_float);

src/comm/mpi/settings.cpp

@@ -64 +64 @@
 void VMG::MPI::Settings::ComputeSettings(Multigrid& sol, Multigrid& rhs, MPI_Comm& comm_global)
 {
-  int rank;
-  MPI_Comm comm_last, comm_new;
+
   std::map<const Grid*, Grid*>::const_iterator grid_iter;
 

src/level/level_operator_cs.cpp

@@ -30 +30 @@
   Grid& sol_f = sol(sol.Level());
   Grid& rhs_f = rhs(rhs.Level());
-
-  Grid& sol_c_dist = sol(sol.Level()-1);
   Grid& rhs_c_dist = rhs(rhs.Level()-1);
-
-  Grid& sol_c_undist = comm.GetCoarserGrid(sol);
   Grid& rhs_c_undist = comm.GetCoarserGrid(rhs);
 
@@ -88 +84 @@
 
   Grid& sol_c = sol(sol.Level());
-  Grid& rhs_c = rhs(rhs.Level());
-
   Grid& sol_f_dist = sol(sol.Level()+1);
-  Grid& rhs_f_dist = rhs(rhs.Level()+1);
-
   Grid& sol_f_undist = comm.GetFinerGrid(sol);
   Grid& rhs_f_undist = comm.GetFinerGrid(rhs);

src/level/level_operator_fas.cpp

@@ -98 +98 @@
 
   Grid& sol_c = sol(sol.Level());
-  Grid& rhs_c = rhs(rhs.Level());
-
   Grid& sol_f_dist = sol(sol.Level()+1);
   Grid& rhs_f_dist = rhs(rhs.Level()+1);
-
   Grid& sol_f_undist = comm.GetFinerGrid(sol);
   Grid& rhs_f_undist = comm.GetFinerGrid(rhs);

src/units/particle/bspline.hpp

@@ -43 +43 @@
     assert(p.Pos().Z() >= grid.Extent().Begin().Z() && p.Pos().Z() < grid.Extent().End().Z());
 
-    vmg_float vals[Helper::intpow(2*near_field_cells+1,3)];
+    std::vector<vmg_float> vals(Helper::intpow(2*near_field_cells+1,3));
     vmg_float temp_val;
     vmg_float int_val = 0.0;

src/units/particle/comm_mpi_particle.cpp

@@ -57 +57 @@
   std::vector< std::vector<vmg_float> > recv_buffer_q(size);
   std::vector< std::vector<vmg_int> > recv_buffer_ind(size);
-  MPI_Datatype dt_temp;
 
   std::memcpy(&global_extent[6*rank], grid.Global().LocalBegin().vec(), 3*sizeof(int));
@@ -199 +198 @@
   // Add potential values
   for (int i=0; i<size; ++i)
-    for (unsigned int j=0; j<size_receive[i]; ++j) {
+    for (vmg_int j=0; j<size_receive[i]; ++j) {
       p[recv_buffer_index[i][j]] = recv_buffer_float[i][4*j];
       std::memcpy(&f[recv_buffer_index[i][j]], &recv_buffer_float[i][4*j+1], 3*sizeof(vmg_float));

src/units/particle/interface_particles.cpp

@@ -117 +117 @@
    * Get parameters and arrays
    */
-  const vmg_int& num_particles_local = factory.GetObjectStorageVal<vmg_int>("PARTICLE_NUM_LOCAL");
   const vmg_int& near_field_cells = factory.GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
   const vmg_int& interpolation_degree = factory.GetObjectStorageVal<int>("PARTICLE_INTERPOLATION_DEGREE");
-  vmg_float* p = factory.GetObjectStorageArray<vmg_float>("PARTICLE_POTENTIAL_ARRAY");
-  vmg_float* f = factory.GetObjectStorageArray<vmg_float>("PARTICLE_FIELD_ARRAY");
 
   Particle::Interpolation ip(interpolation_degree);
@@ -198 +195 @@
 #ifdef DEBUG_OUTPUT
   vmg_float* q = factory.GetObjectStorageArray<vmg_float>("PARTICLE_CHARGE_ARRAY");
+  const vmg_int& num_particles_local = factory.GetObjectStorageVal<vmg_int>("PARTICLE_NUM_LOCAL");
+  const vmg_float* p = factory.GetObjectStorageArray<vmg_float>("PARTICLE_POTENTIAL_ARRAY");
+  const vmg_float* f = factory.GetObjectStorageArray<vmg_float>("PARTICLE_FIELD_ARRAY");
+
 
   e_long = comm.GlobalSumRoot(e_long);

src/units/particle/interpolation.cpp

@@ -14 +14 @@
 using namespace VMG;
 
-Particle::Interpolation::Interpolation(const unsigned int& degree) :
+Particle::Interpolation::Interpolation(const int& degree) :
   deg(degree),
   deg_1(degree+1),
@@ -36 +36 @@
   Index i;
 
-  const Index begin = index - (static_cast<int>(deg_1)-1)/2 - 1;
+  const Index begin = index - deg/2 - 1;
 
   h = grid.Extent().MeshWidth();
@@ -68 +68 @@
   vmg_float power = 1.0;
   unsigned long faculty = 1;
-  unsigned int c;
+  int c;
   Index i;
 
@@ -77 +77 @@
   ++i[direction];
   for (c=1; c<deg_1; ++i[direction], ++c) {
-    for (unsigned int j=0; j<deg_1-c; ++j)
+    for (int j=0; j<deg_1-c; ++j)
       coeff_buffer[j] = coeff_buffer[j+1] - coeff_buffer[j];
     faculty *= c;

src/units/particle/interpolation.hpp

@@ -20 +20 @@
 {
 public:
-  Interpolation(const unsigned int& degree);
+  Interpolation(const int& degree);
   ~Interpolation();
 
@@ -43 +43 @@
   vmg_float* coeff;
   vmg_float* coeff_buffer;
-  unsigned int deg, deg_1;
+  int deg, deg_1;
   Vector pos_begin;
   Vector h;