Merge pull request #1726 from su2code/update_catch2

Update catch.hpp to v2.13.9

Author: pcarruscag

UnitTests/Common/containers/CLookupTable_tests.cpp

@@ -26,10 +26,8 @@
  */
 
 #include "catch.hpp"
-#include <sstream>
-#include <filesystem>
 
-#include <dirent.h>
+#include <sstream>
 #include <stdio.h>
 
 #include "../../../Common/include/CConfig.hpp"
@@ -64,7 +62,7 @@ TEST_CASE("LUTreader", "[tabulated chemistry]") {
   enth = 0.9; 
   look_up_tag = "Viscosity";
   look_up_table.LookUp_ProgEnth(look_up_tag, &look_up_dat, prog, enth, name_CV1, name_CV2); 
-  CHECK(look_up_dat == Approx(0.00007));
+  CHECK(look_up_dat == Approx(0.0000674286));
 
   /* find the table limits */
 

UnitTests/Common/toolboxes/ndflattener_tests.cpp

@@ -30,14 +30,15 @@
 
 TEST_CASE("NdFlattener Test", "[NdFlattener]"){
 
-  int rank; SU2_MPI::Comm_rank(SU2_MPI::GetComm(), &rank);
-  int size; SU2_MPI::Comm_size(SU2_MPI::GetComm(), &size);
+  int rank_; SU2_MPI::Comm_rank(SU2_MPI::GetComm(), &rank_);
+  int size_; SU2_MPI::Comm_size(SU2_MPI::GetComm(), &size_);
+  const size_t rank = rank_, size = size_;
 
   /*-- Provide non-flat array --*/
   su2double** A = new su2double*[2];
   A[0] = new su2double[2]; A[0][0] = 0.0; A[0][1] = 1.0;
   A[1] = new su2double[3+rank];
-  for(int i=0; i<3+rank; i++)
+  for(size_t i=0; i<3+rank; i++)
     A[1][i] = 2.0 + rank + i;
 
   /*-- Accessor --*/
@@ -59,7 +60,7 @@ TEST_CASE("NdFlattener Test", "[NdFlattener]"){
   REQUIRE( nd2[0][0] == 0.0 );
   REQUIRE( nd2[0][1] == 1.0 );
   REQUIRE( nd2[1].size() == 3 + rank );
-  for(int i=0; i<3+rank; i++){
+  for(size_t i=0; i<3+rank; i++){
     REQUIRE( nd2[1][i] == 2.0 + rank + i );
   }
 
@@ -72,25 +73,25 @@ TEST_CASE("NdFlattener Test", "[NdFlattener]"){
 
   /*-- Check gathered structure, non-const look-up. --*/
   REQUIRE( nd3.size() == size );
-  for(int r=0; r<size; r++){
+  for(size_t r=0; r<size; r++){
     REQUIRE( nd3[r].size() == 2 );
     REQUIRE( nd3[r][0][0] == 0.7 );
     REQUIRE( nd3[r][0][1] == 1.7 );
     REQUIRE( nd3[r][1].size() == 3 + r );
-    for(int i=0; i<3+r; i++){
+    for(size_t i=0; i<3+r; i++){
       REQUIRE( nd3[r][1][i] == 2.0 + r + i );
     }
   }
 
   /*-- Check gathered structure, const look-up. --*/
   const NdFlattener<3>& nd3_const = nd3;
   REQUIRE( nd3_const.size() == size );
-  for(int r=0; r<size; r++){
+  for(size_t r=0; r<size; r++){
     REQUIRE( nd3_const[r].size() == 2 );
     REQUIRE( nd3_const[r][0][0] == 0.7 );
     REQUIRE( nd3_const[r][0][1] == 1.7 );
     REQUIRE( nd3_const[r][1].size() == 3 + r );
-    for(int i=0; i<3+r; i++){
+    for(size_t i=0; i<3+r; i++){
       REQUIRE( nd3_const[r][1][i] == 2.0 + r + i );
     }
   }
@@ -100,12 +101,12 @@ TEST_CASE("NdFlattener Test", "[NdFlattener]"){
   nd2.initialize_or_refresh(f);
   nd3.refresh(Nd_MPI_Environment(), nd2);
   REQUIRE( nd3.size() == size );
-  for(int r=0; r<size; r++){
+  for(size_t r=0; r<size; r++){
     REQUIRE( nd3[r].size() == 2 );
     REQUIRE( nd3[r][0][0] == 0.5 );
     REQUIRE( nd3[r][0][1] == 1.0 );
     REQUIRE( nd3[r][1].size() == 3 + r );
-    for(int i=0; i<3+r; i++){
+    for(size_t i=0; i<3+r; i++){
       REQUIRE( nd3[r][1][i] == 2.0 + r + i );
     }
   }
@@ -118,7 +119,7 @@ TEST_CASE("NdFlattener Test", "[NdFlattener]"){
   );
   const NdFlattener<1, unsigned long>& a1_const = a1;
   REQUIRE( a1.size() == 3 + rank );
-  for(int i=0; i<3+rank; i++){
+  for(size_t i=0; i<3+rank; i++){
     REQUIRE( a1[i] == 2 + rank + i );
     REQUIRE( a1_const[i] == 2 + rank + i );
   }
@@ -128,9 +129,9 @@ TEST_CASE("NdFlattener Test", "[NdFlattener]"){
   REQUIRE( a1_const[0] == 2 + rank );
   const NdFlattener<2, unsigned long> a2_const(Nd_MPI_Environment(MPI_UNSIGNED_LONG), a1);
   REQUIRE( a2_const.size() == size );
-  for(int r=0; r<size; r++){
+  for(size_t r=0; r<size; r++){
     REQUIRE( a2_const[r].size() == 3 + r );
-    for(int i=0; i<3+r; i++){
+    for(size_t i=0; i<3+r; i++){
       REQUIRE( a2_const[r][i] == 2 + r + i );
     }
   }