Skip to content

Commit 3d22919

Browse files
streevestreeve
authored
Merge pull request #46 from streeve/warnings
Fix warnings
2 parents 0dade55 + 9d669bd commit 3d22919

File tree

10 files changed

+96
-97
lines changed

10 files changed

+96
-97
lines changed

‎decks/custom_init.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Custom_Particle_Initializer : public Particle_Initializer {
3636
particle_list_t& particles,
3737
size_t nx,
3838
size_t ny,
39-
size_t nz,
39+
size_t,
4040
size_t ng,
4141
real_ dxp,
4242
size_t nppc,

‎example/example.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@
2020

2121
#include "input/deck.h"
2222

23+
// Requires C++14
24+
static auto make_field_solver(field_array_t &fields)
25+
{
26+
// TODO: make this support 1/2/3d
27+
#ifdef ES_FIELD_SOLVER
28+
std::cout << "Created ES Solver" << std::endl;
29+
Field_Solver<ES_Field_Solver> field_solver(fields);
30+
#else // EM
31+
std::cout << "Created EM Solver" << std::endl;
32+
Field_Solver<EM_Field_Solver> field_solver(fields);
33+
#endif
34+
return field_solver;
35+
}
36+
2337
// Global variable to hold paramters
2438
//Parameters params;
2539
Input_Deck deck;

‎src/accumulator.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
void clear_accumulator_array(
66
field_array_t& fields,
77
accumulator_array_t& accumulators,
8-
size_t nx, // TODO: we can probably pull these out of global params..
9-
size_t ny,
10-
size_t nz
8+
size_t, // TODO: we can probably pull these out of global params..
9+
size_t,
10+
size_t
1111
)
1212
{
1313
auto _clean_accumulator = KOKKOS_LAMBDA(const int i)
@@ -39,7 +39,7 @@ void clear_accumulator_array(
3939
};
4040

4141
Kokkos::RangePolicy<ExecutionSpace> exec_policy( 0, fields.size() );
42-
Kokkos::parallel_for( exec_policy, _clean_accumulator, "clean_accumulator()" );
42+
Kokkos::parallel_for( "clean_accumulator()", exec_policy, _clean_accumulator );
4343
}
4444

4545
void unload_accumulator_array(
@@ -107,7 +107,7 @@ void unload_accumulator_array(
107107

108108
//may not be enough if particles run into ghost cells
109109
Kokkos::MDRangePolicy< Kokkos::Rank<3> > non_ghost_policy( {ng,ng,ng}, {nx+ng+1, ny+ng+1, nz+ng+1} ); // Try not to into ghosts // TODO: dry this
110-
Kokkos::parallel_for( non_ghost_policy, _unload_accumulator, "unload_accumulator()" );
110+
Kokkos::parallel_for( "unload_accumulator()", non_ghost_policy, _unload_accumulator );
111111

112112
/* // Crib sheet for old variable names
113113
a0 = &a(x, y, z );
@@ -120,4 +120,3 @@ void unload_accumulator_array(
120120
*/
121121

122122
}
123-

‎src/fields.h

Lines changed: 52 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void serial_update_ghosts_B(
5151
//}
5252

5353
Kokkos::MDRangePolicy<Kokkos::Rank<2>> zy_policy({1,1}, {nz+1,ny+1});
54-
Kokkos::parallel_for( zy_policy, _zy_boundary, "zy boundary()" );
54+
Kokkos::parallel_for( "zy boundary()", zy_policy, _zy_boundary );
5555

5656
//for (int x = 0; x < nx+2; x++) {
5757
//for (int z = 1; z < nz+1; z++) {
@@ -73,7 +73,7 @@ void serial_update_ghosts_B(
7373
};
7474
//}
7575
Kokkos::MDRangePolicy<Kokkos::Rank<2>> xz_policy({0,1}, {nx+2,nz+1});
76-
Kokkos::parallel_for( xz_policy, _xz_boundary, "xz boundary()" );
76+
Kokkos::parallel_for( "xz boundary()", xz_policy, _xz_boundary );
7777

7878
//for (int y = 0; y < ny+2; y++) {
7979
//for (int x = 0; x < nx+2; x++) {
@@ -95,7 +95,7 @@ void serial_update_ghosts_B(
9595
};
9696
//}
9797
Kokkos::MDRangePolicy<Kokkos::Rank<2>> yx_policy({0,0}, {ny+2,nx+2});
98-
Kokkos::parallel_for( yx_policy, _yx_boundary, "yx boundary()" );
98+
Kokkos::parallel_for( "yx boundary()", yx_policy, _yx_boundary );
9999
}
100100
}
101101

@@ -140,7 +140,7 @@ void serial_update_ghosts(
140140
}
141141
};
142142
Kokkos::RangePolicy<ExecutionSpace> x_policy(1, nx+1);
143-
Kokkos::parallel_for( x_policy, _x_boundary, "_x_boundary()" );
143+
Kokkos::parallel_for( "_x_boundary()", x_policy, _x_boundary );
144144

145145
//for ( y = 1; y <= ny; y++ ){
146146
auto _y_boundary = KOKKOS_LAMBDA( const int y )
@@ -160,7 +160,7 @@ void serial_update_ghosts(
160160
}
161161
};
162162
Kokkos::RangePolicy<ExecutionSpace> y_policy(1, ny+1);
163-
Kokkos::parallel_for( y_policy, _y_boundary, "_y_boundary()" );
163+
Kokkos::parallel_for( "_y_boundary()", y_policy, _y_boundary );
164164

165165
//for ( z = 1; z <= nz; z++ ){
166166
auto _z_boundary = KOKKOS_LAMBDA( const int z )
@@ -180,7 +180,7 @@ void serial_update_ghosts(
180180
}
181181
};
182182
Kokkos::RangePolicy<ExecutionSpace> z_policy(1, nz+1);
183-
Kokkos::parallel_for( z_policy, _z_boundary, "_z_boundary()" );
183+
Kokkos::parallel_for( "_z_boundary()", z_policy, _z_boundary );
184184

185185
// // Copy x from RHS -> LHS
186186
// int x = 1;
@@ -311,7 +311,7 @@ template<typename Solver_Type> class Field_Solver : public Solver_Type
311311
jfz(i) = 0.0;
312312
};
313313

314-
Kokkos::parallel_for( fields.size(), _init_fields, "init_fields()" );
314+
Kokkos::parallel_for( "init_fields()", fields.size(), _init_fields );
315315
}
316316

317317
void advance_b(
@@ -349,28 +349,28 @@ class ES_Field_Solver
349349
public:
350350

351351
void advance_b(
352-
field_array_t& fields,
353-
real_t px,
354-
real_t py,
355-
real_t pz,
356-
size_t nx,
357-
size_t ny,
358-
size_t nz,
359-
size_t ng
352+
field_array_t&,
353+
real_t,
354+
real_t,
355+
real_t,
356+
size_t,
357+
size_t,
358+
size_t,
359+
size_t
360360
)
361361
{
362362
// No-op, becasue ES
363363
}
364364

365365
void advance_e(
366366
field_array_t& fields,
367-
real_t px,
368-
real_t py,
369-
real_t pz,
370-
size_t nx,
371-
size_t ny,
372-
size_t nz,
373-
size_t ng,
367+
real_t,
368+
real_t,
369+
real_t,
370+
size_t,
371+
size_t,
372+
size_t,
373+
size_t,
374374
real_t dt_eps0
375375
)
376376
{
@@ -397,17 +397,17 @@ class ES_Field_Solver
397397
};
398398

399399
Kokkos::RangePolicy<ExecutionSpace> exec_policy( 0, fields.size() );
400-
Kokkos::parallel_for( exec_policy, _advance_e, "es_advance_e()" );
400+
Kokkos::parallel_for( "es_advance_e()", exec_policy, _advance_e );
401401
}
402402

403403
real_t e_energy(
404404
field_array_t& fields,
405-
real_t px,
406-
real_t py,
407-
real_t pz,
408-
size_t nx,
409-
size_t ny,
410-
size_t nz
405+
real_t,
406+
real_t,
407+
real_t,
408+
size_t,
409+
size_t,
410+
size_t
411411
)
412412
{
413413
auto ex = Cabana::slice<FIELD_EX>(fields);
@@ -434,12 +434,12 @@ class ES_Field_Solver_1D
434434

435435
real_t e_energy(
436436
field_array_t& fields,
437-
real_t px,
438-
real_t py,
439-
real_t pz,
440-
size_t nx,
441-
size_t ny,
442-
size_t nz
437+
real_t,
438+
real_t,
439+
real_t,
440+
size_t,
441+
size_t,
442+
size_t
443443
)
444444
{
445445
auto ex = Cabana::slice<FIELD_EX>(fields);
@@ -460,9 +460,9 @@ class ES_Field_Solver_1D
460460

461461
void advance_e(
462462
field_array_t& fields,
463-
real_t px,
464-
real_t py,
465-
real_t pz,
463+
real_t,
464+
real_t,
465+
real_t,
466466
size_t nx,
467467
size_t ny,
468468
size_t nz,
@@ -490,7 +490,7 @@ class ES_Field_Solver_1D
490490
};
491491

492492
Kokkos::RangePolicy<ExecutionSpace> exec_policy( 0, fields.size() );
493-
Kokkos::parallel_for( exec_policy, _advance_e, "es_advance_e_1d()" );
493+
Kokkos::parallel_for( "es_advance_e_1d()", exec_policy, _advance_e );
494494
}
495495
};
496496

@@ -507,14 +507,14 @@ class EM_Field_Solver
507507
void dump_fields(FILE * fp,
508508
field_array_t& d_fields,
509509
real_t xmin,
510-
real_t ymin,
511-
real_t zmin,
510+
real_t,
511+
real_t,
512512
real_t dx,
513-
real_t dy,
514-
real_t dz,
513+
real_t,
514+
real_t,
515515
size_t nx,
516516
size_t ny,
517-
size_t nz,
517+
size_t,
518518
size_t ng
519519
)
520520
{
@@ -540,9 +540,9 @@ class EM_Field_Solver
540540

541541
real_t e_energy(
542542
field_array_t& fields,
543-
real_t px,
544-
real_t py,
545-
real_t pz,
543+
real_t,
544+
real_t,
545+
real_t,
546546
size_t nx,
547547
size_t ny,
548548
size_t nz,
@@ -572,9 +572,9 @@ class EM_Field_Solver
572572

573573
real_t b_energy(
574574
field_array_t& fields,
575-
real_t px,
576-
real_t py,
577-
real_t pz,
575+
real_t,
576+
real_t,
577+
real_t,
578578
size_t nx,
579579
size_t ny,
580580
size_t nz,
@@ -646,7 +646,7 @@ class EM_Field_Solver
646646
};
647647

648648
Kokkos::MDRangePolicy<Kokkos::Rank<3>> zyx_policy({1, 1, 1}, {nx+2, ny+2, nz+2});
649-
Kokkos::parallel_for( zyx_policy, _advance_e, "advance_e()" );
649+
Kokkos::parallel_for( "advance_e()", zyx_policy, _advance_e );
650650
}
651651

652652

@@ -699,25 +699,11 @@ class EM_Field_Solver
699699
};
700700

701701
Kokkos::MDRangePolicy<Kokkos::Rank<3>> zyx_policy({1, 1, 1}, {nx+1, ny+1, nz+1});
702-
Kokkos::parallel_for( zyx_policy, _advance_b, "advance_b()" );
702+
Kokkos::parallel_for( "advance_b()", zyx_policy, _advance_b );
703703
serial_update_ghosts_B(cbx, cby, cbz, nx, ny, nz, ng);
704704
}
705705
};
706706

707-
// Requires C++14
708-
static auto make_field_solver(field_array_t& fields)
709-
{
710-
// TODO: make this support 1/2/3d
711-
#ifdef ES_FIELD_SOLVER
712-
std::cout << "Created ES Solver" << std::endl;
713-
Field_Solver<ES_Field_Solver> field_solver(fields);
714-
#else // EM
715-
std::cout << "Created EM Solver" << std::endl;
716-
Field_Solver<EM_Field_Solver> field_solver(fields);
717-
#endif
718-
return field_solver;
719-
}
720-
721707
template<typename field_solver_t>
722708
void dump_energies(
723709
field_solver_t& field_solver,

‎src/helpers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ int allow_for_ghosts(int pre_ghost)
2828
}
2929

3030
// Function to print out the data for every particle.
31-
void dump_particles( FILE * fp, const particle_list_t d_particles, const real_t xmin, const real_t ymin, const real_t zmin, const real_t dx, const real_t dy, const real_t dz,size_t nx,size_t ny,size_t nz, size_t ng)
31+
void dump_particles( FILE * fp, const particle_list_t d_particles, const real_t xmin, const real_t, const real_t, const real_t dx, const real_t, const real_t, size_t nx,size_t ny,size_t, size_t ng)
3232
{
3333

3434
// Host
@@ -110,7 +110,7 @@ void print_fields( const field_array_t& fields )
110110
};
111111

112112
Kokkos::RangePolicy<ExecutionSpace> exec_policy( 0, fields.size() );
113-
Kokkos::parallel_for( exec_policy, _print_fields, "print()" );
113+
Kokkos::parallel_for( "print()", exec_policy, _print_fields );
114114

115115
std::cout << std::endl;
116116

‎src/input/deck.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ class Field_Initializer {
2828

2929
virtual void init(
3030
field_array_t& fields,
31-
size_t nx,
32-
size_t ny,
33-
size_t nz,
34-
size_t ng,
35-
real_ Lx, // TODO: do we prefer xmin or Lx?
36-
real_ Ly,
37-
real_ Lz,
38-
real_ dx,
39-
real_ dy,
40-
real_ dz
31+
size_t,
32+
size_t,
33+
size_t,
34+
size_t,
35+
real_, // TODO: do we prefer xmin or Lx?
36+
real_,
37+
real_,
38+
real_,
39+
real_,
40+
real_
4141
)
4242
{
4343
std::cout << "Default field init" << std::endl;
@@ -62,7 +62,7 @@ class Field_Initializer {
6262
cbz(i) = 0.0;
6363
};
6464

65-
Kokkos::parallel_for( fields.size(), _init_fields, "zero_fields()" );
65+
Kokkos::parallel_for( "zero_fields()", fields.size(), _init_fields );
6666

6767
}
6868
};
@@ -80,15 +80,15 @@ class Particle_Initializer {
8080
particle_list_t& particles,
8181
size_t nx,
8282
size_t ny,
83-
size_t nz,
84-
size_t ng,
83+
size_t,
84+
size_t,
8585
real_ dxp,
8686
size_t nppc,
8787
real_ w,
8888
real_ v0,
89-
real_ Lx,
90-
real_ Ly,
91-
real_ Lz
89+
real_,
90+
real_,
91+
real_
9292
)
9393
{
9494
// TODO: this doesnt currently do anything with nppc/num_cells

0 commit comments

Comments
 (0)