remove degas2xgc c/fortran API

Since XGC won't have osh file in real life, it is pointless for now.

Author: Fuad-HH

src/pcms/capi/interpolator.cpp

@@ -34,57 +34,6 @@ PcmsInterpolatorHandle pcms_create_point_based_interpolator(
   return {reinterpret_cast<void*>(interpolator)};
 }
 
-PcmsInterpolatorHandle pcms_create_degas2xgc_interpolator(
-  const char* xgc_mesh_filename, const char* dg2_mesh_filename, double radius,
-  int degree, int min_req_supports, double lambda, double decay_factor)
-{
-  // use the xgc_mesh_nodes as source points and
-  // dg2 element centroids as target points
-  // then, create a point based interpolator like above
-  auto xgc_fname = std::string(xgc_mesh_filename);
-  auto dg2_fname = std::string(dg2_mesh_filename);
-
-  // trim the filenames since they are coming from c or fortran api which may
-  // have extra spaces at the end
-  xgc_fname = xgc_fname.erase(xgc_fname.find_last_not_of(" \n\r\t") + 1);
-  dg2_fname = dg2_fname.erase(dg2_fname.find_last_not_of(" \n\r\t") + 1);
-  pcms::printInfo(
-    "The interpolator got xgc mesh file: %s and dg2 mesh file: %s\n",
-    xgc_fname.c_str(), dg2_fname.c_str());
-
-  // read the meshes
-  auto xgc_mesh_lib = Omega_h::Library(nullptr, nullptr, MPI_COMM_SELF);
-  auto xgc_mesh = Omega_h::binary::read(xgc_fname, xgc_mesh_lib.world());
-  auto dg2_mesh_lib = Omega_h::Library(nullptr, nullptr, MPI_COMM_SELF);
-  auto dg2_mesh = Omega_h::binary::read(dg2_fname, dg2_mesh_lib.world());
-
-  auto xgc_nodes = xgc_mesh.coords();
-  auto xgc_num_nodes = xgc_mesh.nverts();
-  OMEGA_H_CHECK_PRINTF(xgc_mesh.dim() == 2, "XGC mesh dimension is not 2D %d\n",
-                       xgc_mesh.dim());
-  OMEGA_H_CHECK_PRINTF(
-    xgc_num_nodes * 2 == xgc_nodes.size(),
-    "XGC mesh nodes size does not match the number of vertices %d != %d\n",
-    xgc_num_nodes * 2, xgc_nodes.size());
-  OMEGA_H_CHECK_PRINTF(dg2_mesh.dim() == 2, "DG2 mesh dimension is not 2D %d\n",
-                       dg2_mesh.dim());
-
-  auto dg2_num_elems = dg2_mesh.nelems();
-  auto dg2_elem_centroids = getCentroids(dg2_mesh);
-  OMEGA_H_CHECK_PRINTF(dg2_num_elems * 2 == dg2_elem_centroids.size(),
-                       "DG2 mesh element centroids size does not match the "
-                       "number of elements %d != %d\n",
-                       dg2_num_elems * 2, dg2_elem_centroids.size());
-
-  Omega_h::HostRead<Omega_h::Real> xgc_nodes_host(xgc_nodes);
-  Omega_h::HostRead<Omega_h::Real> dg2_elem_centroids_host(dg2_elem_centroids);
-
-  return pcms_create_point_based_interpolator(
-    (void*)dg2_elem_centroids_host.data(), dg2_elem_centroids.size(),
-    (void*)xgc_nodes_host.data(), xgc_nodes.size(), radius, degree,
-    min_req_supports, lambda, decay_factor);
-}
-
 Omega_h::HostRead<Omega_h::Real> read_mesh_centroids(const char* mesh_filename,
                                                      int& num_elements)
 {
@@ -128,7 +77,7 @@ PcmsInterpolatorHandle pcms_create_degas2xgcnode_interpolator(
   // available
 
   int dg2_num_elems = 0;
-  auto dg2_elem_centroids_host =
+  Omega_h::HostRead<Omega_h::Real> dg2_elem_centroids_host =
     read_mesh_centroids(dg2_mesh_filename, dg2_num_elems);
   write_void_int_pointer(dg2_elem_count, dg2_num_elems);
 
@@ -144,7 +93,7 @@ PcmsInterpolatorHandle pcms_create_xgcnodedegas2_interpolator(
   double lambda, double decay_factor)
 {
   int dg2_num_elems = 0;
-  auto dg2_elem_centroids_host =
+  Omega_h::HostRead<Omega_h::Real> dg2_elem_centroids_host =
     read_mesh_centroids(dg2_mesh_filename, dg2_num_elems);
   write_void_int_pointer(dg2_elem_count, dg2_num_elems);
 

src/pcms/capi/interpolator.h

@@ -34,9 +34,6 @@ PcmsInterpolatorHandle pcms_create_point_based_interpolator(
   void* source_points, int source_points_size, void* target_points,
   int target_points_size, double radius, int degree, int min_req_supports,
   double lambda, double decay_factor);
-PcmsInterpolatorHandle pcms_create_degas2xgc_interpolator(
-  const char* xgc_mesh_filename, const char* dg2_mesh_filename, double radius,
-  int degree, int min_req_supports, double lambda, double decay_factor);
 PcmsInterpolatorHandle pcms_create_degas2xgcnode_interpolator(
   void* target_points, int target_points_size, const char* dg2_mesh_filename,
   double radius, void* dg2_elem_count, int degree, int min_req_supports,

src/pcms/fortranapi/interpolator.i

@@ -23,7 +23,6 @@ typedef struct PcmsInterpolatorHandle PcmsInterpolatorHandle;
 
 PcmsInterpolatorHandle pcms_create_point_based_interpolator(void* source_points, int source_points_size,
                                                                       void* target_points, int target_points_size, double radius, int degree, int min_req_supports, double lambda, double decay_factor);
-PcmsInterpolatorHandle pcms_create_degas2xgc_interpolator(const char* xgc_mesh_filename, const char* dg2_mesh_filename, double radius, int degree, int min_req_supports, double lambda, double decay_factor);
 PcmsInterpolatorHandle pcms_create_degas2xgcnode_interpolator(void* target_points, int target_points_size,
                                                                 const char* dg2_mesh_filename, double radius, void* dg2_elem_count, int degree, int min_req_supports, double lambda, double decay_factor);
 PcmsInterpolatorHandle pcms_create_xgcnodedegas2_interpolator(const char* dg2_mesh_filename, void* source_points, int source_points_size,

src/pcms/fortranapi/interpolator_wrap.c

@@ -498,36 +498,6 @@ SWIGEXPORT SwigClassWrapper _wrap_pcms_create_point_based_interpolator(
   return fresult;
 }
 
-SWIGEXPORT SwigClassWrapper _wrap_pcms_create_degas2xgc_interpolator(
-  SwigArrayWrapper* farg1, SwigArrayWrapper* farg2, double const* farg3,
-  int const* farg4, int const* farg5, double const* farg6, double const* farg7)
-{
-  SwigClassWrapper fresult;
-  char* arg1 = (char*)0;
-  char* arg2 = (char*)0;
-  double arg3;
-  int arg4;
-  int arg5;
-  double arg6;
-  double arg7;
-  PcmsInterpolatorHandle result;
-
-  arg1 = (char*)(farg1->data);
-  arg2 = (char*)(farg2->data);
-  arg3 = (double)(*farg3);
-  arg4 = (int)(*farg4);
-  arg5 = (int)(*farg5);
-  arg6 = (double)(*farg6);
-  arg7 = (double)(*farg7);
-  result = pcms_create_degas2xgc_interpolator(
-    (char const*)arg1, (char const*)arg2, arg3, arg4, arg5, arg6, arg7);
-  fresult.cptr = (PcmsInterpolatorHandle*)memcpy(
-    (PcmsInterpolatorHandle*)calloc(1, sizeof(PcmsInterpolatorHandle)), &result,
-    sizeof(PcmsInterpolatorHandle));
-  fresult.cmemflags = SWIG_MEM_RVALUE | SWIG_MEM_OWN;
-  return fresult;
-}
-
 SWIGEXPORT SwigClassWrapper _wrap_pcms_create_degas2xgcnode_interpolator(
   void const** farg1, int const* farg2, SwigArrayWrapper* farg3,
   double const* farg4, void const** farg5, int const* farg6, int const* farg7,

src/pcms/fortranapi/pcms_interpolator.f90

@@ -43,7 +43,6 @@ module pcms_interpolator
   type(C_PTR), public :: data = C_NULL_PTR
   integer(C_SIZE_T), public :: size = 0
  end type
- public :: pcms_create_degas2xgc_interpolator
  public :: pcms_create_degas2xgcnode_interpolator
  public :: pcms_create_xgcnodedegas2_interpolator
  public :: pcms_create_interpolator
@@ -176,22 +175,6 @@ function swigc_pcms_create_point_based_interpolator(farg1, farg2, farg3, farg4,
 type(SwigClassWrapper) :: fresult
 end function
 
-function swigc_pcms_create_degas2xgc_interpolator(farg1, farg2, farg3, farg4, farg5, farg6, farg7) &
-bind(C, name="_wrap_pcms_create_degas2xgc_interpolator") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-import :: swigarraywrapper
-import :: swigclasswrapper
-type(SwigArrayWrapper) :: farg1
-type(SwigArrayWrapper) :: farg2
-real(C_DOUBLE), intent(in) :: farg3
-integer(C_INT), intent(in) :: farg4
-integer(C_INT), intent(in) :: farg5
-real(C_DOUBLE), intent(in) :: farg6
-real(C_DOUBLE), intent(in) :: farg7
-type(SwigClassWrapper) :: fresult
-end function
-
 function swigc_pcms_create_degas2xgcnode_interpolator(farg1, farg2, farg3, farg4, farg5, farg6, farg7, farg8, farg9) &
 bind(C, name="_wrap_pcms_create_degas2xgcnode_interpolator") &
 result(fresult)
@@ -493,40 +476,6 @@ subroutine SWIGTM_fin_char_Sm_(finp, iminp, temp)
   iminp%size = len(finp, kind=C_SIZE_T)
 end subroutine
 
-function pcms_create_degas2xgc_interpolator(xgc_mesh_filename, dg2_mesh_filename, radius, degree, min_req_supports, lambda, &
-  decay_factor) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(PcmsInterpolatorHandle) :: swig_result
-character(len=*), intent(in) :: xgc_mesh_filename
-character(len=*), intent(in) :: dg2_mesh_filename
-real(C_DOUBLE), intent(in) :: radius
-integer(C_INT), intent(in) :: degree
-integer(C_INT), intent(in) :: min_req_supports
-real(C_DOUBLE), intent(in) :: lambda
-real(C_DOUBLE), intent(in) :: decay_factor
-type(SwigClassWrapper) :: fresult 
-character(kind=C_CHAR), dimension(:), allocatable, target :: farg1_temp 
-type(SwigArrayWrapper) :: farg1 
-character(kind=C_CHAR), dimension(:), allocatable, target :: farg2_temp 
-type(SwigArrayWrapper) :: farg2 
-real(C_DOUBLE) :: farg3 
-integer(C_INT) :: farg4 
-integer(C_INT) :: farg5 
-real(C_DOUBLE) :: farg6 
-real(C_DOUBLE) :: farg7 
-
-call SWIGTM_fin_char_Sm_(xgc_mesh_filename, farg1, farg1_temp)
-call SWIGTM_fin_char_Sm_(dg2_mesh_filename, farg2, farg2_temp)
-farg3 = radius
-farg4 = degree
-farg5 = min_req_supports
-farg6 = lambda
-farg7 = decay_factor
-fresult = swigc_pcms_create_degas2xgc_interpolator(farg1, farg2, farg3, farg4, farg5, farg6, farg7)
-swig_result%swigdata = fresult
-end function
-
 function pcms_create_degas2xgcnode_interpolator(target_points, target_points_size, dg2_mesh_filename, radius, dg2_elem_count, &
   degree, min_req_supports, lambda, decay_factor) &
 result(swig_result)