Skip to content

Commit 16e0686

Browse files
markusbattarbeemarkusbattarbee
committed
Renamed all velocity-related AMR messages and variables to VAMR, cleaned up a few remnant warnings, added sized deallocations.
1 parent bcb048c commit 16e0686

28 files changed

+174
-183
lines changed

‎MAKE/Makefile.Freezer

Lines changed: 27 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -18,76 +18,53 @@ ifeq ($(DISTRIBUTION_FP_PRECISION),SPF)
1818
# INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/../vlasiator/vlasovsolver
1919
else
2020
#Double-precision
21-
# VECTORCLASS = VEC4D_AGNER
22-
# INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/vectorclass
23-
VECTORCLASS = VEC4D_FALLBACK
24-
INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/../vlasiator/vlasovsolver
21+
VECTORCLASS = VEC4D_AGNER
22+
INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/vectorclass
23+
# VECTORCLASS = VEC4D_FALLBACK
24+
# INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/../vlasiator/vlasovsolver
2525
endif
2626

27-
#FLAGS = -ggdb
27+
#======= Compiler and compilation flags =========
28+
# NOTES on compiler flags:
29+
# CXXFLAGS is for compiler flags, they are always used
30+
# MATHFLAGS are for special math etc. flags, these are only applied on solver functions
31+
# LDFLAGS flags for linker
2832

29-
#GNU flags:
30-
CC_BRAND = gcc
31-
CC_BRAND_VERSION = 6.2.0
32-
CXXFLAGS += -O3 -fopenmp -funroll-loops -std=c++17 -W -Wall -Wno-unused -fabi-version=0 -mavx2
33-
#CXXFLAGS += -ggdb -O0 -fopenmp -funroll-loops -std=c++17 -W -Wall -Wno-unused -fabi-version=0 -mavx2
34-
testpackage: CXXFLAGS = -g -ggdb -O2 -fopenmp -funroll-loops -std=c++17 -fabi-version=0 -mno-avx -mno-fma -fno-unsafe-math-optimizations
33+
CXXFLAGS += -O3 -fopenmp -funroll-loops -std=c++17 -W -Wall -Wno-unused -fabi-version=0 -mfma -mavx2 -Wno-unknown-pragmas -Wno-sign-compare
34+
testpackage: CXXFLAGS = -g -ggdb -O2 -fopenmp -funroll-loops -std=c++17 -fabi-version=0 -mno-avx -mno-fma -fno-unsafe-math-optimizations
3535

3636
MATHFLAGS = -ffast-math
37-
testpackage: MATHFLAGS = -fno-unsafe-math-optimizations
37+
testpackage: MATHFLAGS = -fno-unsafe-math-optimizations
3838

39-
LDFLAGS =
40-
#-g -ggdb
39+
#LDFLAGS = -g -ggdb
4140
LIB_MPI = -lgomp -lgfortran -lpapi
4241

43-
4442
#======== PAPI ==========
4543
#Add PAPI_MEM define to use papi to report memory consumption?
46-
#CXXFLAGS += -DPAPI_MEM
47-
#testpackage: CXXFLAGS += -DPAPI_MEM
44+
CXXFLAGS += -DPAPI_MEM
45+
testpackage: CXXFLAGS += -DPAPI_MEM
4846

4947
#======== Allocator =========
5048
#Use jemalloc instead of system malloc to reduce memory fragmentation? https://github.com/jemalloc/jemalloc
5149
#Configure jemalloc with --with-jemalloc-prefix=je_ when installing it
52-
#CXXFLAGS += -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
53-
#testpackage: CXXFLAGS += -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
54-
55-
56-
#======= Compiler and compilation flags =========
57-
# NOTES on compiler flags:
58-
# CXXFLAGS is for compiler flags, they are always used
59-
# MATHFLAGS are for special math etc. flags, these are only applied on solver functions
60-
# LDFLAGS flags for linker
61-
62-
# BOOST_VERSION = current trilinos version
63-
# ZOLTAN_VERSION = current trilinos verson
50+
CXXFLAGS += -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
51+
testpackage: CXXFLAGS += -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
6452

6553
#======== Libraries ===========
66-
67-
MPT_VERSION = 7.5.1
68-
JEMALLOC_VERSION = 4.0.4
6954
LIBRARY_PREFIX = /home/markusb/git/vlasiator-lib
7055

56+
INC_BOOST = -isystem /usr/include/boost
57+
LIB_BOOST = -L/usr/include/boost -lboost_program_options
7158

72-
#compiled libraries
73-
# INC_BOOST = -I$(CRAY_TRILINOS_PREFIX_DIR)/include/boost
74-
# LIB_BOOST = -L$(CRAY_TRILINOS_PREFIX_DIR)/lib -lboost_program_options
75-
76-
# INC_ZOLTAN = -I$(CRAY_TRILINOS_PREFIX_DIR)/include
77-
# LIB_ZOLTAN = -I$(CRAY_TRILINOS_PREFIX_DIR)/lib -lzoltan
59+
INC_ZOLTAN = -isystem /usr/include/trilinos
60+
LIB_ZOLTAN = -I/usr/lib/x86_64-linux-gnu -ltrilinos_zoltan
7861

79-
INC_BOOST = -I/usr/include/trilinos
80-
LIB_BOOST = -L/usr/include/trilinos -lboost_program_options
62+
#INC_PAPI = -I$(LIBRARY_PREFIX)/papi/include
63+
#LIB_PAPI = -I$(LIBRARY_PREFIX)/papi/lib -Wl,-rpath=$(LIBRARY_PREFIX)/papi/lib
8164

82-
INC_ZOLTAN = -I/usr/include/trilinos
83-
#LIB_ZOLTAN = -I/usr/lib/x86_64-linux-gnu -ltrilinos_zoltan
84-
LIB_ZOLTAN = -ltrilinos_zoltan
85-
USE_TRILINOS=1
86-
87-
INC_JEMALLOC = -I$(LIBRARY_PREFIX)/jemalloc/include
65+
INC_JEMALLOC = -isystem $(LIBRARY_PREFIX)/jemalloc/include
8866
LIB_JEMALLOC = -L$(LIBRARY_PREFIX)/jemalloc/lib -ljemalloc -Wl,-rpath=$(LIBRARY_PREFIX)/jemalloc/lib
8967

90-
9168
INC_VLSV = -I$(LIBRARY_PREFIX)/vlsv
9269
LIB_VLSV = -L$(LIBRARY_PREFIX)/vlsv -lvlsv -Wl,-rpath=$(LIBRARY_PREFIX)/vlsv/lib
9370

@@ -96,10 +73,10 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include
9673

9774
#header libraries
9875

99-
INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen
76+
INC_EIGEN = -isystem $(LIBRARY_PREFIX)/eigen
10077
#INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen-eigen-07105f7124f9
101-
INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg_new_neighbours
102-
#INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg_master
78+
#INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg_new_neighbours
79+
INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg
10380
INC_FSGRID = -I$(LIBRARY_PREFIX)/fsgrid
10481

10582

‎Makefile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ COMPFLAGS += -DACC_SEMILAG_PQM -DTRANS_SEMILAG_PPM
5555
#May cause problems
5656
#COMPFLAGS += -DCATCH_FPE
5757

58-
#Define MESH=AMR if you want to use adaptive mesh refinement in velocity space
59-
#MESH = AMR
58+
#Define MESH=VAMR if you want to use adaptive mesh refinement in velocity space
59+
#MESH = VAMR
6060

6161
#//////////////////////////////////////////////////////
6262
# The rest of this file users shouldn't need to change
@@ -78,8 +78,8 @@ COMPFLAGS += -D${DISTRIBUTION_FP_PRECISION}
7878
COMPFLAGS += -D${VECTORCLASS}
7979

8080
# If adaptive mesh refinement is used, add a precompiler flag
81-
ifeq ($(MESH),AMR)
82-
COMPFLAGS += -DAMR
81+
ifeq ($(MESH),VAMR)
82+
COMPFLAGS += -DVAMR
8383
endif
8484

8585
# Set compiler flags
@@ -175,23 +175,23 @@ DEPS_CPU_MOMENTS = ${DEPS_COMMON} ${DEPS_CELL} vlasovmover.h vlasovsolver/cpu_mo
175175

176176
DEPS_CPU_TRANS_MAP = ${DEPS_COMMON} ${DEPS_CELL} grid.h vlasovsolver/vec.h vlasovsolver/cpu_trans_map.hpp vlasovsolver/cpu_trans_map.cpp vlasovsolver/cpu_trans_map_amr.hpp vlasovsolver/cpu_trans_map_amr.cpp
177177

178-
DEPS_CPU_TRANS_MAP_AMR = ${DEPS_COMMON} ${DEPS_CELL} grid.h vlasovsolver/vec.h vlasovsolver/cpu_trans_map.hpp vlasovsolver/cpu_trans_map.cpp vlasovsolver/cpu_trans_map_amr.hpp vlasovsolver/cpu_trans_map_amr.cpp
178+
#DEPS_CPU_TRANS_MAP_AMR = ${DEPS_COMMON} ${DEPS_CELL} grid.h vlasovsolver/vec.h vlasovsolver/cpu_trans_map.hpp vlasovsolver/cpu_trans_map.cpp vlasovsolver/cpu_trans_map_amr.hpp vlasovsolver/cpu_trans_map_amr.cpp
179179

180180
DEPS_VLSVMOVER = ${DEPS_CELL} vlasovsolver/vlasovmover.cpp vlasovsolver/cpu_acc_map.hpp vlasovsolver/cpu_acc_intersections.hpp \
181181
vlasovsolver/cpu_acc_intersections.hpp vlasovsolver/cpu_acc_semilag.hpp vlasovsolver/cpu_acc_transform.hpp \
182182
vlasovsolver/cpu_moments.h vlasovsolver/cpu_trans_map.hpp vlasovsolver/cpu_trans_map_amr.hpp
183183

184-
DEPS_VLSVMOVER_AMR = ${DEPS_CELL} vlasovsolver_amr/vlasovmover.cpp vlasovsolver_amr/cpu_acc_map.hpp vlasovsolver_amr/cpu_acc_intersections.hpp \
184+
DEPS_VLSVMOVER_VAMR = ${DEPS_CELL} vlasovsolver_amr/vlasovmover.cpp vlasovsolver_amr/cpu_acc_map_amr.hpp vlasovsolver_amr/cpu_acc_intersections.hpp \
185185
vlasovsolver_amr/cpu_acc_intersections.hpp vlasovsolver_amr/cpu_acc_semilag.hpp vlasovsolver_amr/cpu_acc_transform.hpp \
186-
vlasovsolver/cpu_moments.h vlasovsolver_amr/cpu_trans_map.hpp vlasovsolver/cpu_trans_map_amr.hpp velocity_blocks.h
186+
vlasovsolver/cpu_moments.h vlasovsolver_amr/cpu_trans_map_amr.hpp vlasovsolver/cpu_trans_map_amr.hpp velocity_blocks.h
187187

188188
#DEPS_PROJECTS = projects/project.h projects/project.cpp \
189189
# projects/MultiPeak/MultiPeak.h projects/MultiPeak/MultiPeak.cpp ${DEPS_CELL}
190190

191191
#all objects for vlasiator
192192

193193
OBJS = version.o memoryallocation.o backgroundfield.o quadr.o dipole.o linedipole.o vectordipole.o constantfield.o integratefunction.o \
194-
datareducer.o datareductionoperator.o dro_populations.o amr_refinement_criteria.o\
194+
datareducer.o datareductionoperator.o dro_populations.o vamr_refinement_criteria.o\
195195
donotcompute.o ionosphere.o conductingsphere.o outflow.o setbyuser.o setmaxwellian.o\
196196
bulirschStoer.o dormandPrince.o euler.o eulerAdaptive.o fieldtracing.o \
197197
sysboundary.o sysboundarycondition.o particle_species.o\
@@ -204,8 +204,8 @@ OBJS = version.o memoryallocation.o backgroundfield.o quadr.o dipole.o linedipo
204204
common.o parameters.o readparameters.o spatial_cell.o mesh_data_container.o\
205205
vlasovmover.o $(FIELDSOLVER).o fs_common.o fs_limiters.o gridGlue.o
206206

207-
# Add Vlasov solver objects (depend on mesh: AMR or non-AMR)
208-
ifeq ($(MESH),AMR)
207+
# Add Vlasov solver objects (depend on mesh: VAMR or non-VAMR)
208+
ifeq ($(MESH),VAMR)
209209
OBJS += cpu_moments.o
210210
else
211211
OBJS += cpu_acc_intersections.o cpu_acc_map.o cpu_acc_sort_blocks.o cpu_acc_load_blocks.o cpu_acc_semilag.o cpu_acc_transform.o \
@@ -242,8 +242,8 @@ version.cpp: FORCE
242242
version.o: version.cpp
243243
${CMP} ${CXXFLAGS} ${FLAGS} -c version.cpp
244244

245-
amr_refinement_criteria.o: ${DEPS_COMMON} velocity_blocks.h amr_refinement_criteria.h amr_refinement_criteria.cpp object_factory.h
246-
${CMP} ${CXXFLAGS} ${FLAGS} ${MATHFLAGS} -c amr_refinement_criteria.cpp ${INC_DCCRG} ${INC_ZOLTAN} ${INC_BOOST} ${INC_FSGRID}
245+
vamr_refinement_criteria.o: ${DEPS_COMMON} velocity_blocks.h vamr_refinement_criteria.h vamr_refinement_criteria.cpp object_factory.h
246+
${CMP} ${CXXFLAGS} ${FLAGS} ${MATHFLAGS} -c vamr_refinement_criteria.cpp ${INC_DCCRG} ${INC_ZOLTAN} ${INC_BOOST} ${INC_FSGRID}
247247

248248
memoryallocation.o: memoryallocation.cpp
249249
${CMP} ${CXXFLAGS} ${FLAGS} -c memoryallocation.cpp ${INC_PAPI}
@@ -402,9 +402,9 @@ projectTriAxisSearch.o: ${DEPS_COMMON} $(DEPS_PROJECTS) projects/projectTriAxisS
402402
spatial_cell.o: ${DEPS_CELL} spatial_cell.cpp
403403
$(CMP) $(CXXFLAGS) ${MATHFLAGS} $(FLAGS) -c spatial_cell.cpp $(INC_BOOST) ${INC_DCCRG} ${INC_EIGEN} ${INC_ZOLTAN} ${INC_VECTORCLASS} ${INC_FSGRID}
404404

405-
ifeq ($(MESH),AMR)
406-
vlasovmover.o: ${DEPS_VLSVMOVER_AMR}
407-
${CMP} ${CXXFLAGS} ${FLAG_OPENMP} ${MATHFLAGS} ${FLAGS} -DMOVER_VLASOV_ORDER=2 -c vlasovsolver_amr/vlasovmover.cpp -I$(CURDIR) ${INC_BOOST} ${INC_EIGEN} ${INC_DCCRG} ${INC_ZOLTAN} ${INC_PROFILE} ${INC_VECTORCLASS} ${INC_EIGEN} ${INC_VLSV}
405+
ifeq ($(MESH),VAMR)
406+
vlasovmover.o: ${DEPS_VLSVMOVER_VAMR}
407+
${CMP} ${CXXFLAGS} ${FLAG_OPENMP} ${MATHFLAGS} ${FLAGS} -DMOVER_VLASOV_ORDER=2 -c vlasovsolver_amr/vlasovmover.cpp -I$(CURDIR) ${INC_BOOST} ${INC_EIGEN} ${INC_DCCRG} ${INC_FSGRID} ${INC_ZOLTAN} ${INC_PROFILE} ${INC_VECTORCLASS} ${INC_EIGEN} ${INC_VLSV}
408408
else
409409

410410
cpu_acc_intersections.o: ${DEPS_CPU_ACC_INTERSECTS}

‎datareduction/datareducer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void initializeDataReducers(DataReducer * outputReducer, DataReducer * diagnosti
192192
}
193193
if(lowercase == "vg_amr_translate_comm") { // Flag for AMR translation communication
194194
outputReducer->addOperator(new DRO::DataReductionOperatorCellParams("vg_amr_translate_comm",CellParams::AMR_TRANSLATE_COMM_X,3));
195-
//outputReducer->addMetadata(outputReducer->size()-1,"","AMR-translate","1.0");
195+
outputReducer->addMetadata(outputReducer->size()-1,"","","AMRtranslate","1.0");
196196
continue;
197197
}
198198
if(lowercase == "fg_rhom") { // Overall mass density (summed over all populations)

‎definitions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace geometry {
6868
}
6969

7070
namespace vmesh {
71-
#ifndef AMR
71+
#ifndef VAMR
7272
typedef uint32_t GlobalID; /**< Datatype used for velocity block global IDs.*/
7373
typedef uint32_t LocalID; /**< Datatype used for velocity block local IDs.*/
7474
#else
@@ -89,7 +89,7 @@ namespace vmesh {
8989
/** Definition of a function that takes in a velocity block with neighbor data,
9090
* and returns a number that is used to decide whether or not the block should
9191
* be refined or coarsened.*/
92-
typedef Realf (*AmrVelRefinement)(const Realf* velBlock);
92+
typedef Realf (*VAmrVelRefinement)(const Realf* velBlock);
9393

9494
// neighborhoods, these are initialized in grid.cpp:initializeGrid
9595

‎grid.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
#endif
5151

5252
#ifndef NDEBUG
53-
#ifdef AMR
54-
#define DEBUG_AMR_VALIDATE
53+
#ifdef VAMR
54+
#define DEBUG_VAMR_VALIDATE
5555
#endif
5656
#endif
5757

@@ -306,7 +306,7 @@ void initializeGrids(
306306

307307
for (uint popID=0; popID<getObjectWrapper().particleSpecies.size(); ++popID) {
308308
adjustVelocityBlocks(mpiGrid,cells,true,popID);
309-
#ifdef DEBUG_AMR_VALIDATE
309+
#ifdef DEBUG_VAMR_VALIDATE
310310
writeVelMesh(mpiGrid);
311311
validateMesh(mpiGrid,popID);
312312
#endif
@@ -1133,9 +1133,9 @@ void initializeStencils(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpi
11331133

11341134
bool validateMesh(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpiGrid,const uint popID) {
11351135
bool rvalue = true;
1136-
#ifndef AMR
1136+
#ifndef VAMR
11371137
return rvalue;
1138-
#endif
1138+
#else
11391139

11401140
phiprof::start("mesh validation (init)");
11411141

@@ -1152,7 +1152,7 @@ bool validateMesh(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpiGrid,c
11521152
int iter=0;
11531153

11541154
do {
1155-
#ifdef DEBUG_AMR_VALIDATE
1155+
#ifdef DEBUG_VAMR_VALIDATE
11561156
if (iter == 0) {
11571157
writeVelMesh(mpiGrid);
11581158
}
@@ -1178,7 +1178,7 @@ bool validateMesh(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpiGrid,c
11781178
// Get all spatial neighbors
11791179
//const vector<CellID>* neighbors = mpiGrid.get_neighbors_of(cells[c],NEAREST_NEIGHBORHOOD_ID);
11801180
const auto* neighbors = mpiGrid.get_neighbors_of(cells[c], NEAREST_NEIGHBORHOOD_ID);
1181-
//#warning TODO should vAMR grandparents be checked only for face neighbors instead of NEAREST_NEIGHBORHOOD_ID?
1181+
//#warning TODO should VAMR grandparents be checked only for face neighbors instead of NEAREST_NEIGHBORHOOD_ID?
11821182

11831183
// Iterate over all spatial neighbors
11841184
// for (size_t n=0; n<neighbors->size(); ++n) {
@@ -1285,7 +1285,7 @@ bool validateMesh(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpiGrid,c
12851285
}
12861286
phiprof::stop("recalculate distrib. functions");
12871287

1288-
#ifdef DEBUG_AMR_VALIDATE
1288+
#ifdef DEBUG_VAMR_VALIDATE
12891289
writeVelMesh(mpiGrid);
12901290
#endif
12911291
++iter;
@@ -1300,6 +1300,7 @@ bool validateMesh(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpiGrid,c
13001300

13011301
phiprof::stop("mesh validation (init)");
13021302
return rvalue;
1303+
#endif
13031304
}
13041305

13051306
void mapRefinement(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpiGrid, FsGrid<fsgrids::technical, FS_STENCIL_WIDTH> & technicalGrid) {

‎grid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void report_grid_memory_consumption(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Ge
106106
void shrink_to_fit_grid_data(dccrg::Dccrg<SpatialCell,dccrg::Cartesian_Geometry>& mpiGrid);
107107

108108
/** Validate the velocity mesh structure. This function is only relevant for
109-
* the AMR mesh. It makes sure that the mesh structure is valid for all spatial cells,
109+
* the VAMR mesh. It makes sure that the mesh structure is valid for all spatial cells,
110110
* i.e., that each velocity block has at most one refinement level difference to
111111
* its neighbors (in spatial and velocity space).
112112
* @param mpiGrid Parallel grid.

‎memoryallocation.cpp

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ void *operator new(size_t size)
5050
return p;
5151
}
5252

53-
// TODO: sized deallocation to resolve -Wsized-deallocation
54-
// Global delete using jemalloc
55-
void operator delete(void *p)
56-
{
57-
je_free(p);
58-
}
59-
6053
// Global new[] using jemalloc
6154
void *operator new[](size_t size)
6255
{
@@ -70,13 +63,27 @@ void *operator new[](size_t size)
7063
return p;
7164
}
7265

73-
// TODO: sized deallocation to resolve -Wsized-deallocation
66+
// Global delete using jemalloc
67+
void operator delete(void *p)
68+
{
69+
je_free(p);
70+
}
71+
7472
// Global delete[] using jemalloc
7573
void operator delete[](void *p)
7674
{
7775
je_free(p);
7876
}
7977

78+
#if __cpp_sized_deallocation >= 201309
79+
void operator delete(void *ptr, std::size_t size) noexcept {
80+
je_sdallocx(ptr, size, /*flags=*/0);
81+
}
82+
void operator delete[](void *ptr, std::size_t size) noexcept {
83+
je_sdallocx(ptr, size, /*flags=*/0);
84+
}
85+
#endif // __cpp_sized_deallocation
86+
8087
#endif
8188

8289

‎mesh_data_container.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
#include "mesh_data.h"
3737

38-
#ifndef AMR
38+
#ifndef VAMR
3939
#include "velocity_mesh_old.h"
4040
#else
4141
#include "velocity_mesh_amr.h"

‎object_wrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "definitions.h"
2929
#include "item_storage.h"
3030
#include "object_factory.h"
31-
#include "amr_refinement_criteria.h"
31+
#include "vamr_refinement_criteria.h"
3232
#include "mesh_data_container.h"
3333
#include "particle_species.h"
3434
#include "projects/project.h"
@@ -38,7 +38,7 @@
3838
struct ObjectWrapper {
3939
ObjectWrapper() { }
4040

41-
ObjectFactory<amr_ref_criteria::Base> amrVelRefCriteria; /**< Factory for all known AMR refinement criteria.*/
41+
ObjectFactory<vamr_ref_criteria::Base> vamrVelRefCriteria; /**< Factory for all known VAMR refinement criteria.*/
4242
mesh::MeshDataContainer meshData; /**< Container for user-defined mesh data.*/
4343
std::vector<species::Species> particleSpecies; /**< Parameters for all particle species.*/
4444
projects::Project* project; /**< Simulated project.*/

0 commit comments

Comments
 (0)