Skip to content

Commit

Permalink
Merge pull request #1275 from LLNL/feature/taylor/shroud-generate
Browse files Browse the repository at this point in the history 
Regenerate wrappers with Shroud-0.13.0
  • Loading branch information
@ltaylor16
ltaylor16 committed Feb 15, 2024
2 parents e7fad6a + 91d57f4 commit 0a47cb2
Show file tree
Hide file tree
Showing 41 changed files with 4,107 additions and 2,883 deletions.
4 changes: 2 additions & 2 deletions ...o-tpl-toss_4_x86_64_ib-intel@19.0.4.cmake → ...o-tpl-toss_4_x86_64_ib-intel@19.1.2.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set(ENABLE_FORTRAN ON CACHE BOOL "")

set(COMPILER_HOME "/usr/tce/packages/intel-classic-tce/intel-classic-19.0.4" )
set(COMPILER_HOME "/usr/tce/packages/intel-classic-tce/intel-classic-19.1.2" )
set(CMAKE_C_COMPILER "${COMPILER_HOME}/bin/icc" CACHE PATH "")
set(CMAKE_CXX_COMPILER "${COMPILER_HOME}/bin/icpc" CACHE PATH "")
set(CMAKE_Fortran_COMPILER "${COMPILER_HOME}/bin/ifort" CACHE PATH "")
Expand All @@ -44,7 +44,7 @@ set(AXOM_ENABLE_KLEE OFF CACHE BOOL "")
#------------------------------------------------------------------------------
set(ENABLE_MPI ON CACHE BOOL "")

set(MPI_HOME "/usr/tce/packages/mvapich2/mvapich2-2.3-intel-19.0.4" CACHE PATH "")
set(MPI_HOME "/usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2" CACHE PATH "")
set(MPI_C_COMPILER "${MPI_HOME}/bin/mpicc" CACHE PATH "")
set(MPI_CXX_COMPILER "${MPI_HOME}/bin/mpicxx" CACHE PATH "")
set(MPI_Fortran_COMPILER "${MPI_HOME}/bin/mpif90" CACHE PATH "")
Expand Down
8 changes: 7 additions & 1 deletion src/axom/quest/interface/c_fortran/typesQUEST.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// typesQUEST.h
// This file is generated by Shroud 0.12.2. Do not edit.
// This file is generated by Shroud 0.13.0. Do not edit.
//
// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and
// other Axom Project Developers. See the top-level LICENSE file for details.
Expand All @@ -10,10 +10,16 @@
#ifndef TYPESQUEST_H
#define TYPESQUEST_H

// splicer begin types.CXX_declarations
// splicer end types.CXX_declarations

#ifdef __cplusplus
extern "C" {
#endif

// splicer begin types.C_declarations
// splicer end types.C_declarations

// helper capsule_data_helper
struct s_QUEST_SHROUD_capsule_data
{
Expand Down
56 changes: 34 additions & 22 deletions src/axom/quest/interface/c_fortran/wrapQUEST.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,39 @@
// wrapQUEST.cpp
// This file is generated by Shroud 0.12.2. Do not edit.
// This file is generated by Shroud 0.13.0. Do not edit.
//
// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and
// other Axom Project Developers. See the top-level LICENSE file for details.
//
// SPDX-License-Identifier: (BSD-3-Clause)
#include "wrapQUEST.h"
#include <cstdlib>
#include <string>

#include "axom/quest/interface/inout.hpp"
#include "axom/quest/interface/signed_distance.hpp"
#include "typesQUEST.h"
#include <string>
#include "wrapQUEST.h"

// splicer begin CXX_definitions
// splicer end CXX_definitions

extern "C" {

// helper ShroudLenTrim
// Returns the length of character string src with length nsrc,
// ignoring any trailing blanks.
static int ShroudLenTrim(const char *src, int nsrc)
{
int i;

for(i = nsrc - 1; i >= 0; i--)
{
if(src[i] != ' ')
{
break;
}
}

return i + 1;
}

// splicer begin C_definitions
// splicer end C_definitions

Expand All @@ -33,12 +50,13 @@ int QUEST_inout_init_mpi(const char *fileName, MPI_Fint comm)
#endif // ifdef AXOM_USE_MPI

#ifdef AXOM_USE_MPI
int QUEST_inout_init_mpi_bufferify(const char *fileName,
int LfileName,
int QUEST_inout_init_mpi_bufferify(char *fileName,
int SHT_fileName_len,
MPI_Fint comm)
{
// splicer begin function.inout_init_mpi_bufferify
const std::string SHCXX_fileName(fileName, LfileName);
const std::string SHCXX_fileName(fileName,
ShroudLenTrim(fileName, SHT_fileName_len));
MPI_Comm SHCXX_comm = MPI_Comm_f2c(comm);
int SHC_rv = axom::quest::inout_init(SHCXX_fileName, SHCXX_comm);
return SHC_rv;
Expand All @@ -58,10 +76,11 @@ int QUEST_inout_init_serial(const char *fileName)
#endif // ifndef AXOM_USE_MPI

#ifndef AXOM_USE_MPI
int QUEST_inout_init_serial_bufferify(const char *fileName, int LfileName)
int QUEST_inout_init_serial_bufferify(char *fileName, int SHT_fileName_len)
{
// splicer begin function.inout_init_serial_bufferify
const std::string SHCXX_fileName(fileName, LfileName);
const std::string SHCXX_fileName(fileName,
ShroudLenTrim(fileName, SHT_fileName_len));
int SHC_rv = axom::quest::inout_init(SHCXX_fileName);
return SHC_rv;
// splicer end function.inout_init_serial_bufferify
Expand Down Expand Up @@ -177,12 +196,12 @@ int QUEST_signed_distance_init_mpi(const char *file, MPI_Fint comm)
#endif // ifdef AXOM_USE_MPI

#ifdef AXOM_USE_MPI
int QUEST_signed_distance_init_mpi_bufferify(const char *file,
int Lfile,
int QUEST_signed_distance_init_mpi_bufferify(char *file,
int SHT_file_len,
MPI_Fint comm)
{
// splicer begin function.signed_distance_init_mpi_bufferify
const std::string SHCXX_file(file, Lfile);
const std::string SHCXX_file(file, ShroudLenTrim(file, SHT_file_len));
MPI_Comm SHCXX_comm = MPI_Comm_f2c(comm);
int SHC_rv = axom::quest::signed_distance_init(SHCXX_file, SHCXX_comm);
return SHC_rv;
Expand All @@ -202,10 +221,10 @@ int QUEST_signed_distance_init_serial(const char *file)
#endif // ifndef AXOM_USE_MPI

#ifndef AXOM_USE_MPI
int QUEST_signed_distance_init_serial_bufferify(const char *file, int Lfile)
int QUEST_signed_distance_init_serial_bufferify(char *file, int SHT_file_len)
{
// splicer begin function.signed_distance_init_serial_bufferify
const std::string SHCXX_file(file, Lfile);
const std::string SHCXX_file(file, ShroudLenTrim(file, SHT_file_len));
int SHC_rv = axom::quest::signed_distance_init(SHCXX_file);
return SHC_rv;
// splicer end function.signed_distance_init_serial_bufferify
Expand Down Expand Up @@ -317,11 +336,4 @@ void QUEST_signed_distance_finalize(void)
// splicer end function.signed_distance_finalize
}

// Release library allocated memory.
void QUEST_SHROUD_memory_destructor(QUEST_SHROUD_capsule_data *cap)
{
cap->addr = nullptr;
cap->idtor = 0; // avoid deleting again
}

} // extern "C"
44 changes: 22 additions & 22 deletions src/axom/quest/interface/c_fortran/wrapQUEST.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// wrapQUEST.h
// This file is generated by Shroud 0.12.2. Do not edit.
// This file is generated by Shroud 0.13.0. Do not edit.
//
// Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC and
// other Axom Project Developers. See the top-level LICENSE file for details.
Expand All @@ -17,10 +17,10 @@
#ifdef AXOM_USE_MPI
#include "mpi.h"
#endif
#include "typesQUEST.h"
#ifndef __cplusplus
#include <stdbool.h>
#endif
#include "typesQUEST.h"

// splicer begin CXX_declarations
// splicer end CXX_declarations
Expand All @@ -41,21 +41,21 @@ enum QUEST_SignedDistExec
// splicer end C_declarations

#ifdef AXOM_USE_MPI
int QUEST_inout_init_mpi(const char* fileName, MPI_Fint comm);
int QUEST_inout_init_mpi(const char *fileName, MPI_Fint comm);
#endif

#ifdef AXOM_USE_MPI
int QUEST_inout_init_mpi_bufferify(const char* fileName,
int LfileName,
int QUEST_inout_init_mpi_bufferify(char *fileName,
int SHT_fileName_len,
MPI_Fint comm);
#endif

#ifndef AXOM_USE_MPI
int QUEST_inout_init_serial(const char* fileName);
int QUEST_inout_init_serial(const char *fileName);
#endif

#ifndef AXOM_USE_MPI
int QUEST_inout_init_serial_bufferify(const char* fileName, int LfileName);
int QUEST_inout_init_serial_bufferify(char *fileName, int SHT_fileName_len);
#endif

bool QUEST_inout_initialized(void);
Expand All @@ -72,37 +72,37 @@ bool QUEST_inout_evaluate_0(double x, double y);

bool QUEST_inout_evaluate_1(double x, double y, double z);

int QUEST_inout_mesh_min_bounds(double* coords);
int QUEST_inout_mesh_min_bounds(double *coords);

int QUEST_inout_mesh_max_bounds(double* coords);
int QUEST_inout_mesh_max_bounds(double *coords);

int QUEST_inout_mesh_center_of_mass(double* coords);
int QUEST_inout_mesh_center_of_mass(double *coords);

int QUEST_inout_get_dimension(void);

int QUEST_inout_finalize(void);

#ifdef AXOM_USE_MPI
int QUEST_signed_distance_init_mpi(const char* file, MPI_Fint comm);
int QUEST_signed_distance_init_mpi(const char *file, MPI_Fint comm);
#endif

#ifdef AXOM_USE_MPI
int QUEST_signed_distance_init_mpi_bufferify(const char* file,
int Lfile,
int QUEST_signed_distance_init_mpi_bufferify(char *file,
int SHT_file_len,
MPI_Fint comm);
#endif

#ifndef AXOM_USE_MPI
int QUEST_signed_distance_init_serial(const char* file);
int QUEST_signed_distance_init_serial(const char *file);
#endif

#ifndef AXOM_USE_MPI
int QUEST_signed_distance_init_serial_bufferify(const char* file, int Lfile);
int QUEST_signed_distance_init_serial_bufferify(char *file, int SHT_file_len);
#endif

bool QUEST_signed_distance_initialized(void);

void QUEST_signed_distance_get_mesh_bounds(double* lo, double* hi);
void QUEST_signed_distance_get_mesh_bounds(double *lo, double *hi);

void QUEST_signed_distance_set_dimension(int dim);

Expand All @@ -123,12 +123,12 @@ double QUEST_signed_distance_evaluate_0(double x, double y, double z);
double QUEST_signed_distance_evaluate_1(double x,
double y,
double z,
double* cp_x,
double* cp_y,
double* cp_z,
double* n_x,
double* n_y,
double* n_z);
double *cp_x,
double *cp_y,
double *cp_z,
double *n_x,
double *n_y,
double *n_z);

void QUEST_signed_distance_finalize(void);

Expand Down

0 comments on commit 0a47cb2

Please sign in to comment.