Skip to content

Commit ef47f84

Browse files
author
Martin D. Weinberg
committed
Merge branch 'SLboundaries' of github.com:EXP-code/EXP into SLboundaries
2 parents ad96308 + 5d97232 commit ef47f84

23 files changed

Lines changed: 3058 additions & 201 deletions

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.9.0"
5+
VERSION "7.9.1"
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.9.0
51+
PROJECT_NUMBER = 7.9.1
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

expui/BiorthBasis.H

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ namespace BasisClasses
163163

164164
//! Clear the particle selector callback
165165
void clrSelector() { ftor = nullptr; }
166+
167+
//! Evaluate acceleration in Cartesian coordinates in centered
168+
//! coordinate system
169+
virtual std::vector<double> getAccel(double x, double y, double z) = 0;
166170
};
167171

168172
/**
@@ -307,6 +311,9 @@ namespace BasisClasses
307311
return ret;
308312
}
309313

314+
//! Evaluate acceleration in Cartesian coordinates in centered
315+
//! coordinate system
316+
virtual std::vector<double> getAccel(double x, double y, double z);
310317
};
311318

312319
/**
@@ -542,6 +549,10 @@ namespace BasisClasses
542549
return ret;
543550
}
544551

552+
//! Evaluate acceleration in Cartesian coordinates in centered
553+
//! coordinate system
554+
std::vector<double> getAccel(double x, double y, double z);
555+
545556
};
546557

547558
/**
@@ -693,6 +704,10 @@ namespace BasisClasses
693704
return ret;
694705
}
695706

707+
//! Evaluate acceleration in Cartesian coordinates in centered
708+
//! coordinate system
709+
std::vector<double> getAccel(double x, double y, double z);
710+
696711
};
697712

698713
/**
@@ -841,10 +856,18 @@ namespace BasisClasses
841856
bool orthoTest()
842857
{
843858
auto [ret, worst, lworst] = orthoCompute(sl->orthoCheck());
844-
// For the CTest log
845-
std::cout << "---- Cylindrical::orthoTest: worst=" << worst << std::endl;
859+
if (myid==0) {
860+
// For the CTest log
861+
std::cout << "---- Cylindrical::orthoTest: worst=" << worst
862+
<< std::endl;
863+
}
846864
return ret;
847865
}
866+
867+
//! Evaluate acceleration in Cartesian coordinates in centered
868+
//! coordinate system
869+
std::vector<double> getAccel(double x, double y, double z);
870+
848871
};
849872

850873
/**
@@ -991,6 +1014,10 @@ namespace BasisClasses
9911014
return true;
9921015
}
9931016

1017+
//! Evaluate acceleration in Cartesian coordinates in centered
1018+
//! coordinate system
1019+
std::vector<double> getAccel(double x, double y, double z);
1020+
9941021
};
9951022

9961023
/**
@@ -1113,6 +1140,10 @@ namespace BasisClasses
11131140
return true;
11141141
}
11151142

1143+
//! Evaluate acceleration in Cartesian coordinates in centered
1144+
//! coordinate system
1145+
std::vector<double> getAccel(double x, double y, double z);
1146+
11161147
};
11171148

11181149

0 commit comments

Comments
 (0)