Skip to content

OPENACC: Fix for compilation errors #2049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willend merged 2 commits into from
Jun 1, 2025
Merged

OPENACC: Fix for compilation errors #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed7258
Map fprintf(stderr to printf if OPENACC (restores compilation of ESS_…
willend Jun 1, 2025
48ba96c
Sync with r-interoff-lib.c reflective OFF lib
willend Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions common/lib/share/interoff-lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
#ifndef INTEROFF_LIB_C
#define INTEROFF_LIB_C "$Revision$"

#ifdef OPENACC // If on GPU map fprintf to printf
#define fprintf(stderr,...) printf(__VA_ARGS__)
#endif

#pragma acc routine
double off_F(double x, double y,double z,double A,double B,double C,double D) {
return ( A*x + B*y + C*z + D );
Expand Down Expand Up @@ -370,9 +374,7 @@ int off_clip_3D_mod(intersection* t, Coords a, Coords b,
#ifdef OFF_LEGACY
if (t_size>OFF_INTERSECT_MAX)
{
#ifndef OPENACC
fprintf(stderr, "Warning: number of intersection exceeded (%d) (interoff-lib/off_clip_3D_mod)\n", OFF_INTERSECT_MAX);
#endif
return (t_size);
}
#endif
Expand Down Expand Up @@ -454,9 +456,7 @@ int off_clip_3D_mod_grav(intersection* t, Coords pos, Coords vel, Coords acc,

if (t_size>CHAR_BUF_LENGTH)
{
#ifndef OPENACC
fprintf(stderr, "Warning: number of intersection exceeded (%d) (interoff-lib/off_clip_3D_mod)\n", CHAR_BUF_LENGTH);
#endif
return (t_size);
}
//both planes intersect the polygon, let's find the intersection point
Expand Down
12 changes: 8 additions & 4 deletions common/lib/share/r-interoff-lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
#include "r-interoff-lib.h"
#endif

#ifdef OPENACC // If on GPU map fprintf to printf
#define fprintf(stderr,...) printf(__VA_ARGS__)
#endif

#pragma acc routine
double r_off_F(double x, double y,double z,double A,double B,double C,double D) {
return ( A*x + B*y + C*z + D );
Expand Down Expand Up @@ -366,9 +370,7 @@ int r_off_clip_3D_mod(r_intersection* t, Coords a, Coords b,
#ifdef OFF_LEGACY
if (t_size>OFF_INTERSECT_MAX)
{
#ifndef OPENACC
fprintf(stderr, "Warning: number of intersection exceeded (%d) (interoff-lib/off_clip_3D_mod)\n", OFF_INTERSECT_MAX);
#endif
return (t_size);
}
#endif
Expand Down Expand Up @@ -450,9 +452,7 @@ int r_off_clip_3D_mod_grav(r_intersection* t, Coords pos, Coords vel, Coords acc

if (t_size>CHAR_BUF_LENGTH)
{
#ifndef OPENACC
fprintf(stderr, "Warning: number of intersection exceeded (%d) (interoff-lib/off_clip_3D_mod)\n", CHAR_BUF_LENGTH);
#endif
return (t_size);
}
//both planes intersect the polygon, let's find the intersection point
Expand Down Expand Up @@ -891,6 +891,10 @@ int n2 = r - m;
r_intersection *L, *R;
L = (r_intersection *)malloc(sizeof(r_intersection) * n1);
R = (r_intersection *)malloc(sizeof(r_intersection) * n2);
if (!L||!R) {
fprintf(stderr,"Error allocating intersection arrays\n");
exit(-1);
}
/* Copy data to temp arrays L[] and R[] */
#pragma acc loop independent
for (i = 0; i < n1; i++)
Expand Down
Loading