patched openmp warning

some compilers give a warning about the OpenMP atomic pragmas when compiling without OpenMP

also standardised use of 'density-matrix' in unit test sections

Author: TysonRayJones

QuEST/src/CPU/QuEST_cpu.c

@@ -3459,7 +3459,9 @@ void statevec_calcProbOfAllOutcomesLocal(qreal* outcomeProbs, Qureg qureg, int*
             prob = stateRe[i]*stateRe[i] + stateIm[i]*stateIm[i];
 
             // atomicly update corresponding outcome array element
+            # ifdef _OPENMP
             # pragma omp atomic update
+            # endif
             outcomeProbs[outcomeInd] += prob;
         }
     }
@@ -3528,7 +3530,9 @@ void densmatr_calcProbOfAllOutcomesLocal(qreal* outcomeProbs, Qureg qureg, int*
                 outcomeInd += extractBit(qubits[q], basisStateInd) * (1LL << q);
 
             // atomicly update corresponding outcome array element
+            # ifdef _OPENMP
             # pragma omp atomic update
+            # endif
             outcomeProbs[outcomeInd] += stateRe[index];
         }
     }

tests/test_calculations.cpp

@@ -934,7 +934,7 @@ TEST_CASE( "calcProbOfAllOutcomes", "[calculations]" ) {
                 REQUIRE( areEqual(refProbs, probs) );
             }
         }
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             SECTION( "normalised" ) {
 

tests/test_operators.cpp

@@ -593,7 +593,7 @@ TEST_CASE( "applyMultiVarPhaseFunc", "[operators]" ) {
         int numQubitsPerReg[] = {2,3};
         int qubits[] = {0,1,2,3,4};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;
@@ -821,7 +821,7 @@ TEST_CASE( "applyMultiVarPhaseFuncOverrides", "[operators]" ) {
         int numQubitsPerReg[] = {2,3};
         int qubits[] = {0,1,2,3,4};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;
@@ -1072,7 +1072,7 @@ TEST_CASE( "applyNamedPhaseFunc", "[operators]" ) {
         int numQubitsPerReg[] = {2,3};
         int regs[] = {0,1,2,3,4};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;
@@ -1292,7 +1292,7 @@ TEST_CASE( "applyNamedPhaseFuncOverrides", "[operators]" ) {
         int numQubitsPerReg[] = {2,3};
         int regs[] = {0,1,2,3,4};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;
@@ -1663,7 +1663,7 @@ TEST_CASE( "applyParamNamedPhaseFunc", "[operators]" ) {
         int numQubitsPerReg[] = {2,3};
         int regs[] = {0,1,2,3,4};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;
@@ -2053,7 +2053,7 @@ TEST_CASE( "applyParamNamedPhaseFuncOverrides", "[operators]" ) {
         int numQubitsPerReg[] = {2,3};
         int regs[] = {0,1,2,3,4};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;
@@ -2435,7 +2435,7 @@ TEST_CASE( "applyPhaseFunc", "[operators]" ) {
         int numQubits = 3;
         int qubits[] = {0,1,2};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;
@@ -2597,7 +2597,7 @@ TEST_CASE( "applyPhaseFuncOverrides", "[operators]" ) {
         int numQubits = 3;
         int qubits[] = {0,1,2};
 
-        SECTION( "density matrix" ) {
+        SECTION( "density-matrix" ) {
 
             Qureg dens = quregVec;
             dens.isDensityMatrix = 1;