Skip to content

Commit

Permalink
Merge branch 'develop' into update-containers
Browse files Browse the repository at this point in the history
  • Loading branch information
PDoakORNL authored Jun 7, 2019
2 parents 2c0cb7c + de8572c commit 7cd3929
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Utilities/PrimeNumberSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ struct PrimeNumberSet : public PrimeConstants<UIntType>
std::ostringstream o;
o << " PrimeNumberSet::get Failed to generate " << n2add << " prime numbers among " << n
<< " requested.";
throw std::runtime_error(o);
throw std::runtime_error(o.str());
}
primes_add.insert(primes_add.end(), primes.begin() + offset, primes.begin() + offset + n);
return true;
Expand Down
2 changes: 1 addition & 1 deletion testing/miniqmc_openshift_rhea.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BUILD_DIR=$(pwd)
echo $BUILD_DIR

cat > $BUILD_TAG.pbs << EOF
#PBS -A MAT151
#PBS -A MAT151ci
#PBS -N $BUILD_TAG
#PBS -j oe
#PBS -l walltime=1:00:00,nodes=1
Expand Down

0 comments on commit 7cd3929

Please sign in to comment.