Merge branch 'master' into UF23

CRPropa · Jun 3, 2024 · 1d723d0 · 1d723d0
2 parents 8fcce26 + f5b2c43
commit 1d723d0
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,11 +8,11 @@
 ### New features:
  * Added new backwards-compatible function particleMass that returns particle mass also for non-nuclei
  * Added the new Galactic magnetic field models from Unger&Farrar arXiv:2311.12120
+ * Added EBL model from Finke et al. 2022
 
 ### Interface changes:
 
 ### Features that are deprecated and will be removed after this release
- * EBL model from Finke et al. 2022
 
 ### Removed features
 *  AMRMagneticField - underlying library (saga) is no longer supported.

diff --git a/include/crpropa/Referenced.h b/include/crpropa/Referenced.h
@@ -47,7 +47,7 @@ class Referenced {
 #elif defined(__GNUC__)
 		newRef = __sync_add_and_fetch(&_referenceCount, 1);
 #else
-		#pragma omp critical
+		#pragma omp critical(newRef)
 		{newRef = _referenceCount++;}
 #endif
 		return newRef;
@@ -67,7 +67,7 @@ class Referenced {
 #elif defined(__GNUC__)
 		newRef = __sync_sub_and_fetch(&_referenceCount, 1);
 #else
-		#pragma omp critical
+		#pragma omp critical(newRef)
 		{newRef = _referenceCount--;}
 #endif
 

diff --git a/src/Candidate.cpp b/src/Candidate.cpp
@@ -20,7 +20,7 @@ Candidate::Candidate(int id, double E, Vector3d pos, Vector3d dir, double z, dou
 #elif defined(__GNUC__)
 		{serialNumber = __sync_add_and_fetch(&nextSerialNumber, 1);}
 #else
-		#pragma omp critical
+		#pragma omp critical(serialNumber)
 		{serialNumber = nextSerialNumber++;}
 #endif
 
@@ -35,7 +35,7 @@ Candidate::Candidate(const ParticleState &state) :
 #elif defined(__GNUC__)
 		{serialNumber = __sync_add_and_fetch(&nextSerialNumber, 1);}
 #else
-		#pragma omp critical
+		#pragma omp critical(serialNumber)
 		{serialNumber = nextSerialNumber++;}
 #endif
 

diff --git a/src/module/HDF5Output.cpp b/src/module/HDF5Output.cpp
@@ -248,7 +248,7 @@ void HDF5Output::close() {
 }
 
 void HDF5Output::process(Candidate* candidate) const {
-	#pragma omp critical
+	#pragma omp critical(HDFOutput)
 	{
 	if (file == -1)
 		// This is ugly, but necesary as otherwise the user has to manually open the
@@ -316,7 +316,7 @@ void HDF5Output::process(Candidate* candidate) const {
 			pos += v.copyToBuffer(&r.propertyBuffer[pos]);
 	}
 
-	#pragma omp critical
+	#pragma omp critical(HDFOutput)
 	{
 		const_cast<HDF5Output*>(this)->candidatesSinceFlush++;
 		Output::process(candidate);

diff --git a/src/module/OutputShell.cpp b/src/module/OutputShell.cpp
@@ -6,7 +6,7 @@
 namespace crpropa {
 
 void ShellOutput::process(Candidate* c) const {
-#pragma omp critical
+#pragma omp critical(ShellOutput)
 	{
 		std::cout << std::fixed << std::showpoint << std::setprecision(3)
 				<< std::setw(6);
@@ -25,7 +25,7 @@ std::string ShellOutput::getDescription() const {
 }
 
 void ShellOutput1D::process(Candidate* c) const {
-#pragma omp critical
+#pragma omp critical(ShellOutput)
 	{
 		std::cout << std::fixed << std::showpoint << std::setprecision(3)
 				<< std::setw(6);
@@ -43,7 +43,7 @@ std::string ShellOutput1D::getDescription() const {
 
 void ShellPropertyOutput::process(Candidate* c) const {
 	Candidate::PropertyMap::const_iterator i = c->properties.begin();
-#pragma omp critical
+#pragma omp critical(ShellOutput)
 	{
 		for ( ; i != c->properties.end(); i++) {
 			std::cout << "  " << i->first << ", " << i->second << std::endl;

diff --git a/src/module/ParticleCollector.cpp b/src/module/ParticleCollector.cpp
@@ -21,7 +21,7 @@ ParticleCollector::ParticleCollector(const std::size_t nBuffer, const bool clone
 }
 
 void ParticleCollector::process(Candidate *c) const {
-#pragma omp critical
+#pragma omp critical(ModifyContainer)
         {
 		if(clone)
 		       	container.push_back(c->clone(recursive));

diff --git a/src/module/PhotoPionProduction.cpp b/src/module/PhotoPionProduction.cpp
@@ -231,7 +231,7 @@ void PhotoPionProduction::performInteraction(Candidate *candidate, bool onProton
 	int outPartID[2000];
 	int nParticles;
 
-#pragma omp critical
+#pragma omp critical(SophiaEvent)
 	{
 		sophiaevent_(nature, Ein, eps, outputEnergy, outPartID, nParticles);
 	}

diff --git a/src/module/PhotonOutput1D.cpp b/src/module/PhotonOutput1D.cpp
@@ -63,7 +63,7 @@ void PhotonOutput1D::process(Candidate *candidate) const {
 	p += std::sprintf(buffer + p, "%8.4f\t", candidate->source.getEnergy() / EeV);
 	p += std::sprintf(buffer + p, "%8.4f\n", candidate->source.getPosition().getR() / Mpc);
 
-#pragma omp critical
+#pragma omp critical(FileOutput)
 	{
 		out->write(buffer, p);
 	}

diff --git a/src/module/TextOutput.cpp b/src/module/TextOutput.cpp
@@ -271,7 +271,7 @@ void TextOutput::process(Candidate *c) const {
 
 	std::locale::global(old_locale);
 
-#pragma omp critical
+#pragma omp critical(FileOutput)
 	{
 		if (count == 0)
 			printHeader();

diff --git a/src/module/Tools.cpp b/src/module/Tools.cpp
@@ -40,7 +40,7 @@ void PerformanceModule::process(Candidate *candidate) const {
 		times[i] = end - start;
 	}
 
-#pragma omp critical
+#pragma omp critical(PerformanceModule)
 	{
 		for (size_t i = 0; i < modules.size(); i++) {
 			_module_info &m = modules[i];
@@ -109,7 +109,7 @@ void EmissionMapFiller::setEmissionMap(EmissionMap *emissionMap) {
 
 void EmissionMapFiller::process(Candidate* candidate) const {
 	if (emissionMap) {
-		#pragma omp critical
+		#pragma omp critical(EmissionMap)
 		{
 			emissionMap->fillMap(candidate->source);
 		}