From 6bdecf0b7a5e38ff8809a6cdab643b85defc3140 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 16 Jul 2020 11:03:26 +0200
Subject: [PATCH] replace function by subroutine
---
.gitlab-ci.yml | 4 ----
Data | 2 +-
Processes/QGSJetII/qgsjet-II-04.f | 9 +++++++--
Processes/QGSJetII/testQGSJetII.cc | 6 +++---
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07cea657d..4a24fc63c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -343,10 +343,6 @@ example-clang-8:
- cd build
- cmake --build . -- -j4 VERBOSE=1
- set -o pipefail
- - echo "aha"
- - ldd corsika_data/readLib/testData
- - corsika_data/readLib/testData
- - echo "ahaddd"
- ctest -j4 -VV | gzip -v -9 > test.log.gz
- make -j4 run_examples | gzip -v -9 > examples.log.gz
rules:
diff --git a/Data b/Data
index dc1eb37e1..417c94a28 160000
--- a/Data
+++ b/Data
@@ -1 +1 @@
-Subproject commit dc1eb37e1a309993cb0c696109c7a29201375f95
+Subproject commit 417c94a28fde8824e0de3ead918b55781293e6b8
diff --git a/Processes/QGSJetII/qgsjet-II-04.f b/Processes/QGSJetII/qgsjet-II-04.f
index 6a935f62c..5ccf607d2 100644
--- a/Processes/QGSJetII/qgsjet-II-04.f
+++ b/Processes/QGSJetII/qgsjet-II-04.f
@@ -415,7 +415,10 @@ c reading cross sections from the file
if(ifIIdat.ne.1)then
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'qgsdat-II-04.bz2'
* ,exist=lcalc)
- if (lcalc.and.CorDataCanDeCompress().ne.0) then
+ lcanRead=0
+ call CorDataCanDeCompress(lcanRead)
+ write (*,*) 'lcanRead=', lcanRead
+ if (lcalc.and.lcanRead.ne.0) then
luseCompress=1
else
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'qgsdat-II-04'
@@ -1970,7 +1973,9 @@ c nuclear cross sections
if(ifIIncs.ne.2)then
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'sectnu-II-04.bz2'
* ,exist=lcalc)
- if (lcalc.and.CorDataCanDeCompress().ne.0) then
+ lcanRead = 0
+ call CorDataCanDeCompress(lcanRead)
+ if (lcalc.and.lcanRead.ne.0) then
luseCompress=1
else
inquire(file=DATDIR(1:INDEX(DATDIR,' ')-1)//'sectnu-II-04'
diff --git a/Processes/QGSJetII/testQGSJetII.cc b/Processes/QGSJetII/testQGSJetII.cc
index 8310fc5e5..707d6aea6 100644
--- a/Processes/QGSJetII/testQGSJetII.cc
+++ b/Processes/QGSJetII/testQGSJetII.cc
@@ -145,9 +145,9 @@ TEST_CASE("QgsjetIIInterface", "[processes]") {
[[maybe_unused]] const process::EProcessReturn ret = model.DoInteraction(projectile);
[[maybe_unused]] const GrammageType length = model.GetInteractionLength(particle);
- CHECK(length / (1_g / square(1_cm)) == Approx(26568.64).margin(0.1));
- CHECK(view.GetSize() == 8);
- CHECK(sumCharge(view) == 2);
+ CHECK(length / (1_g / square(1_cm)) == Approx(93.47).margin(0.1));
+ CHECK(view.GetSize() == 14);
+ CHECK(sumCharge(view) == 1);
auto const secMomSum = sumMomentum(view, projectileMomentum.GetCoordinateSystem());
CHECK((secMomSum - projectileMomentum).norm() / projectileMomentum.norm() ==
Approx(0).margin(1e-2));
--
GitLab