Skip to content

Commit

Permalink
cleanup compiler warnings in unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@scottaiton
scottaiton committed Oct 23, 2024
1 parent a9d0b55 commit 16e2057
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 38 deletions.
11 changes: 1 addition & 10 deletions src/patches/clawpatch/fclaw_clawpatch.h.3d.average.TEST.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <fclaw_regrid.h>
#include <test.hpp>
#include <test/test.hpp>
#include <fstream>
#include <bitset>
#include <string>

#include <fclaw_forestclaw.h>

Expand Down Expand Up @@ -269,14 +268,6 @@ TEST_CASE("3d clawpatch average")
double* q = fclaw_clawpatch_get_q(g->glob, patch);
double* error_q = fclaw_clawpatch_get_q(iterate->error_glob, error_patch);

//get physical boundaries
int intersects_bc[fclaw_domain_num_faces(domain)];
for(int i=0;i<fclaw_domain_num_faces(domain);i++)
{
fclaw_patch_relation_t type = fclaw_patch_get_face_type(patch, i);
intersects_bc[i] = type == FCLAW_PATCH_BOUNDARY;
}

//clear error q
int size = fclaw_clawpatch_size(iterate->error_glob);
memset(error_q, 0, sizeof(double)*size);
Expand Down
35 changes: 17 additions & 18 deletions src/patches/clawpatch/fclaw_clawpatch.h.3d.ghostfill.TEST.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <fclaw_options.h>
#include <test.hpp>
#include <test/test.hpp>
#include <fstream>
#include <bitset>
#include <string>

#include <fclaw_forestclaw.h>

Expand Down Expand Up @@ -530,8 +529,8 @@ TEST_CASE("3d clawpatch ghost fill on uniform cube")
test_data_out.setup();


char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_uniform_cube_"+std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down Expand Up @@ -636,8 +635,8 @@ TEST_CASE("3d clawpatch ghost fill on cube with refinement")
test_data_out.setup();
CHECK_EQ(test_data_out.glob->domain->global_num_patches, 127);

char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_cube_with_refinement_"+std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down Expand Up @@ -743,8 +742,8 @@ TEST_CASE("3d clawpatch ghost fill on cube with refinement coarse interior")
test_data_out.setup();
CHECK_EQ(test_data_out.glob->domain->global_num_patches, 456);

char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_cube_with_refinement_coarse_interior_"+std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down Expand Up @@ -803,8 +802,8 @@ TEST_CASE("3d clawpatch ghost fill on uniform brick")
test_data_out.setup();


char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_uniform_2x2x2_brick_" + std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down Expand Up @@ -913,8 +912,8 @@ TEST_CASE("3d clawpatch ghost fill on 2x2x2 brick with refinement on one block")
test_data_out.setup();
CHECK_EQ(test_data_out.glob->domain->global_num_patches, (8*7 + 8*8));

char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_2x2x2_brick_with_refinement_on_one_block_"+std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down Expand Up @@ -1024,8 +1023,8 @@ TEST_CASE("3d clawpatch ghost fill on 2x2x2 brick with refinement on all but one
test_data_out.setup();
CHECK_EQ(test_data_out.glob->domain->global_num_patches, 8*1 + 8*8*7);

char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_2x2x2_brick_with_refinement_on_all_but_one_block_"+std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down Expand Up @@ -1140,8 +1139,8 @@ TEST_CASE("3d clawpatch ghost fill on 2x2x2 brick with refinement coarse interio
test_data_out.setup();
CHECK_EQ(test_data_out.glob->domain->global_num_patches, 505);

char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_2x2x2_brick_with_refinement_coarse_interior_"+std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down Expand Up @@ -1256,8 +1255,8 @@ TEST_CASE("3d clawpatch ghost fill on 2x2x2 brick with refinement 2")
test_data_out.setup();
CHECK_EQ(test_data_out.glob->domain->global_num_patches, 113);

char test_no_str[5];
snprintf(test_no_str, 5, "%04d", test_no);
char test_no_str[100];
snprintf(test_no_str, 100, "%04d", test_no);
std::string filename = "3d_clawpatch_ghost_fill_on_2x2x2_brick_with_refinement_2_"+std::string(test_no_str);

test_ghost_fill(test_data, test_data_out, filename);
Expand Down
11 changes: 1 addition & 10 deletions src/patches/clawpatch/fclaw_clawpatch.h.3d.interpolate.TEST.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <fclaw_regrid.h>
#include <test.hpp>
#include <test/test.hpp>
#include <fstream>
#include <bitset>
#include <string>

#include <fclaw_forestclaw.h>

Expand Down Expand Up @@ -249,14 +248,6 @@ TEST_CASE("3d clawpatch interpolate")
double* q = fclaw_clawpatch_get_q(g->glob, patch);
double* error_q = fclaw_clawpatch_get_q(iterate->error_glob, error_patch);

//get physical boundaries
int intersects_bc[fclaw_domain_num_faces(domain)];
for(int i=0;i<fclaw_domain_num_faces(domain);i++)
{
fclaw_patch_relation_t type = fclaw_patch_get_face_type(patch, i);
intersects_bc[i] = type == FCLAW_PATCH_BOUNDARY;
}

//clear error q
int size = fclaw_clawpatch_size(iterate->error_glob);
memset(error_q, 0, sizeof(double)*size);
Expand Down

0 comments on commit 16e2057

Please sign in to comment.