Skip to content

Commit 1a243ca

Browse files
authored
Merge branch 'main' into chunkLogic
2 parents 1ba31df + 75479f8 commit 1a243ca

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25) # Needed for CUDA, MPI, and CTest features
22

33
project(
44
EXP
5-
VERSION "7.10.1"
5+
VERSION "7.9.2"
66
HOMEPAGE_URL https://github.com/EXP-code/EXP
77
LANGUAGES C CXX Fortran)
88

doc/exp.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PROJECT_NAME = EXP
4848
# could be handy for archiving the generated documentation or if some version
4949
# control system is used.
5050

51-
PROJECT_NUMBER = 7.10.1
51+
PROJECT_NUMBER = 7.9.2
5252

5353
# Using the PROJECT_BRIEF tag one can provide an optional one line description
5454
# for a project that appears at the top of each page and should give viewer a

doc/exp.cfg.breathe

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PROJECT_NAME = EXP
4848
# could be handy for archiving the generated documentation or if some version
4949
# control system is used.
5050

51-
PROJECT_NUMBER = 7.10.1
51+
PROJECT_NUMBER = 7.9.2
5252

5353
# Using the PROJECT_BRIEF tag one can provide an optional one line description
5454
# for a project that appears at the top of each page and should give viewer a

exputil/EmpCylSL.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4122,15 +4122,17 @@ void EmpCylSL::accumulate(double r, double z, double phi, double mass,
41224122

41234123
if (compute and covar) {
41244124
int size = vc[id].row(mm).size();
4125-
assert(size == NORDER && "size of vectors must match");
4125+
if (size != NORDER) {
4126+
throw GenericError("size of vectors must match", __FILE__, __LINE__, 1039, false);
4127+
}
41264128
Eigen::VectorXcd vec(size);
41274129

41284130
Eigen::VectorXd vC = vc[id].row(mm).transpose() * norm;
41294131
Eigen::VectorXd vS = vs[id].row(mm).transpose() * norm;
4130-
4131-
// Make sure we only have real part here
4132+
4133+
// For m = 0, the azimuthal dependence vanishes; set vS to zero to ensure a purely real result
41324134
if (mm==0) vS.setZero();
4133-
4135+
41344136
vec.real() = vC*mcos + vS*msin;
41354137
vec.imag() = vC*msin - vS*mcos;
41364138

0 commit comments

Comments
 (0)