Merge branch 'dev' into dev-scalar-floor

.clang-tidy

@@ -33,17 +33,16 @@ Checks: "*,
         -readability-static-accessed-through-instance,
         -misc-unused-parameters,
         -hicpp-multiway-paths-covered,
+        -cert-err58-cpp,
 
         google-readability-avoid-underscore-in-googletest-name,
         google-upgrade-googletest-case,
 
         -bugprone-implicit-widening-of-multiplication-result,
         -bugprone-narrowing-conversions,
-        -cert-dcl59-cpp,
         -cert-env33-c,
         -cert-err33-c,
         -cert-err34-c,
-        -cert-err58-cpp,
         -cert-msc32-c,
         -cert-msc51-cpp,
         -clang-analyzer-core.CallAndMessage,
@@ -80,7 +79,6 @@ Checks: "*,
         -cppcoreguidelines-pro-type-vararg,
         -cppcoreguidelines-special-member-functions,
         -cppcoreguidelines-virtual-class-destructor,
-        -google-build-namespaces,
         -google-explicit-constructor,
         -google-global-names-in-headers,
         -google-readability-casting,
@@ -95,7 +93,6 @@ Checks: "*,
         -hicpp-no-malloc,
         -hicpp-signed-bitwise,
         -hicpp-special-member-functions,
-        -hicpp-use-auto,
         -hicpp-use-equals-default,
         -hicpp-use-noexcept,
         -hicpp-use-nullptr,
@@ -110,23 +107,15 @@ Checks: "*,
         -misc-non-private-member-variables-in-classes,
         -modernize-avoid-c-arrays,
         -modernize-deprecated-headers,
-        -modernize-loop-convert,
         -modernize-macro-to-enum,
         -modernize-redundant-void-arg,
-        -modernize-use-auto,
-        -modernize-use-default-member-init,
         -modernize-use-equals-default,
         -modernize-use-nodiscard,
         -modernize-use-noexcept,
         -modernize-use-nullptr,
         -modernize-use-override,
         -modernize-use-using,
         -openmp-use-default-none,
-        -performance-faster-string-find,
-        -performance-for-range-copy,
-        -performance-inefficient-vector-operation,
-        -performance-unnecessary-value-param,
-        -readability-const-return-type,
         -readability-convert-member-functions-to-static,
         -readability-delete-null-pointer,
         -readability-duplicate-include,
@@ -142,7 +131,6 @@ Checks: "*,
         -readability-non-const-parameter,
         -readability-redundant-control-flow,
         -readability-redundant-preprocessor,
-        -readability-simplify-boolean-expr,
         -readability-suspicious-call-argument"
 WarningsAsErrors: ''
 # More paths can be ignored by modifying this so that it looks like '^((?!/PATH/ONE/|/PATH/TWO/).)*$'

.gitignore

@@ -16,6 +16,7 @@ bin/*
 *.a
 a.out
 *.dSYM
+__pycache__
 
 # Makefiles #
 #############
@@ -39,11 +40,8 @@ data
 out.*
 o.*
 run
-
-
 disk.*
 
-
 # Logs and databases #
 ######################
 *.err
@@ -67,7 +65,6 @@ disk.*
 # OS generated files #
 ######################
 .DS_Store
-
 .remote-sync.json
 .remote-sync_macos.json
 ._*
@@ -85,4 +82,3 @@ Thumbs.db
 #############################
 docs/doxygen/build
 docs/sphinx/build
-

Jenkinsfile

@@ -105,10 +105,10 @@ pipeline
                             sh  '''
                                 printf '=%.0s' {1..100}
                                 printf "\n"
-                                cat tidy_results_cpp.log
+                                cat tidy_results_cpp_${CHOLLA_MAKE_TYPE}.log
                                 printf '=%.0s' {1..100}
                                 printf "\n"
-                                cat tidy_results_gpu.log
+                                cat tidy_results_gpu_${CHOLLA_MAKE_TYPE}.log
                                 printf '=%.0s' {1..100}
                                 printf "\n"
                                 '''

Makefile

@@ -205,10 +205,10 @@ tidy:
 # - --warnings-as-errors=<string> Upgrade all warnings to error, good for CI
 	clang-tidy --verify-config
 	@echo -e
-	(time clang-tidy $(CLANG_TIDY_ARGS) $(CPPFILES_TIDY) -- $(DFLAGS) $(CXXFLAGS_CLANG_TIDY) $(LIBS_CLANG_TIDY)) > tidy_results_cpp.log 2>&1 & \
-	(time clang-tidy $(CLANG_TIDY_ARGS) $(GPUFILES_TIDY) -- $(DFLAGS) $(GPUFLAGS_CLANG_TIDY) $(LIBS_CLANG_TIDY)) > tidy_results_gpu.log 2>&1 & \
+	(time clang-tidy $(CLANG_TIDY_ARGS) $(CPPFILES_TIDY) -- $(DFLAGS) $(CXXFLAGS_CLANG_TIDY) $(LIBS_CLANG_TIDY)) > tidy_results_cpp_$(TYPE).log 2>&1 & \
+	(time clang-tidy $(CLANG_TIDY_ARGS) $(GPUFILES_TIDY) -- $(DFLAGS) $(GPUFLAGS_CLANG_TIDY) $(LIBS_CLANG_TIDY)) > tidy_results_gpu_$(TYPE).log 2>&1 & \
 	for i in 1 2; do wait -n; done
-	@echo -e "\nResults from clang-tidy are available in the 'tidy_results_cpp.log' and 'tidy_results_gpu.log' files."
+	@echo -e "\nResults from clang-tidy are available in the 'tidy_results_cpp_$(TYPE).log' and 'tidy_results_gpu_$(TYPE).log' files."
 
 clean:
 	rm -f $(CLEAN_OBJS)

builds/make.type.mhd

@@ -9,9 +9,7 @@ MPI_GPU   ?=
 DFLAGS    += -DCUDA
 DFLAGS    += -DMPI_CHOLLA
 DFLAGS    += -DPRECISION=2
-# Currently MHD only supports PCM reconstruction. Higher order reconstruction
-# methods will be added later
-DFLAGS    += -DPCM
+DFLAGS    += -DPPMC
 DFLAGS    += -DHLLD
 DFLAGS    += -DMHD
 
@@ -34,7 +32,7 @@ DFLAGS    += -DTEMPERATURE_FLOOR
 # Apply the cooling in the GPU from precomputed tables
 # DFLAGS    += -DCOOLING_GPU
 
-#Measure the Timing of the different stages
+# Measure the Timing of the different stages
 DFLAGS += -DCPU_TIME
 
 DFLAGS    += $(OUTPUT)
@@ -49,7 +47,7 @@ DFLAGS    += $(MPI_GPU)
 # used on scientific runs
 
 # Do CUDA error checking
-DFLAGS += -DCUDA_ERROR_CHECK
+# DFLAGS += -DCUDA_ERROR_CHECK
 
 # Limit the number of steps to evolve.
 # DFLAGS += -DN_STEPS_LIMIT=1000

builds/setup.frontier.cce.sh

@@ -15,3 +15,4 @@ export MPICH_GPU_SUPPORT_ENABLED=1
 export LD_LIBRARY_PATH=${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}
 
 export CHOLLA_ENVSET=1
+export ROCFFT_RTC_CACHE_PATH=/dev/null

examples/3D/mhd_blast.txt

@@ -1,27 +1,27 @@
 #
 # Parameter File for the MHD Blast wavelength
-# See [Gardiner & Stone 2008](https://arxiv.org/abs/0712.2634) for details.
+# See [Stone & Gardiner 2009](https://ui.adsabs.harvard.edu/abs/2009NewA...14..139S/abstract) for details.
 #
 
 ################################################
 # number of grid cells in the x dimension
-nx=128
+nx=200
 # number of grid cells in the y dimension
-ny=128
+ny=300
 # number of grid cells in the z dimension
-nz=128
+nz=200
 # final output time
-tout=0.02
+tout=0.2
 # time interval for output
-outstep=0.02
+outstep=0.2
 # name of initial conditions
 init=MHD_Spherical_Blast
 # domain properties
 xmin=-0.5
-ymin=-0.5
+ymin=-0.75
 zmin=-0.5
 xlen=1.0
-ylen=1.0
+ylen=1.5
 zlen=1.0
 # type of boundary conditions
 xl_bcnd=1
@@ -45,17 +45,17 @@ vy=0.0
 # velocity in the z direction
 vz=0.0
 # initial pressure outside the blast zone
-P=1.0
-# initial pressure inside the blast zone
-P_blast=100.0
+P=0.1
+# initial pressure inside the blast zone. Note that the paper says this should be 100, that is a typo
+P_blast=10.0
 # The radius of the blast zone
-radius=0.125
-# magnetic field in the x direction. Equal to 10/sqrt(2)
-Bx=7.0710678118654746
-# magnetic field in the y direction
-By=0.0
-# magnetic field in the z direction. Equal to 10/sqrt(2)
-Bz=7.0710678118654746
+radius=0.1
+# magnetic field in the x direction. Equal to 1/sqrt(2)
+Bx=0.70710678118654746
+# magnetic field in the y direction. Equal to 1/sqrt(2)
+By=0.70710678118654746
+# magnetic field in the z direction
+Bz=0.0
 
 # value of gamma
 gamma=1.666666666666667

examples/3D/mhd_contact_wave.txt

@@ -57,7 +57,7 @@ By=1.5
 # magnetic field in the z direction
 Bz=0
 # amplitude of perturbing oscillations
-A=1e-1
+A=1e-6
 # value of gamma
 gamma=1.666666666666667
 # The right eigenvectors to set the wave properly