Convert to Fortran strings already in C++

Author: Roberto Di Remigio

src/cavity/GePolCavity.cpp

@@ -85,8 +85,21 @@ extern "C" void generatecavity_cpp(int * maxts, int * maxsph, int * maxvert,
                                    double * xe, double * ye, double * ze, double * rin, double * masses,
                                    double * avgArea, double * rsolv, double * ret,
                                    int * nr_gen, int * gen1, int * gen2, int * gen3,
-				   int * nvert, double * vert, double * centr, const char * pedra, const char * off);
+				   int * nvert, double * vert, double * centr, char * pedra, char * off);
 
+void convertToFortran(char * fstring, size_t fstring_len, const char * cstring)
+{
+    size_t inlen = std::strlen(cstring);
+    size_t cpylen = std::min(inlen, fstring_len);
+
+    if (inlen > fstring_len)
+    {
+        // TODO: truncation error or warning
+    }
+
+    std::copy(cstring, cstring + cpylen, fstring);
+    std::fill(fstring + cpylen, fstring + fstring_len, ' ');
+}
 
 void GePolCavity::build(const std::string & suffix, int maxts, int maxsph, int maxvert)
 {
@@ -169,8 +182,12 @@ void GePolCavity::build(const std::string & suffix, int maxts, int maxsph, int m
 
     std::stringstream pedra;
     pedra << "PEDRA.OUT_" << suffix << "_" << ::getpid();
+    char f_pedra[std::strlen(pedra.str().c_str()) -1];
+    convertToFortran(f_pedra, std::strlen(pedra.str().c_str()) -1, pedra.str().c_str());
     std::stringstream off;
     off << "cavity.off_" << suffix << "_" << ::getpid();
+    char f_off[std::strlen(off.str().c_str()) -1];
+    convertToFortran(f_off, std::strlen(off.str().c_str()) -1, off.str().c_str());
     // Go PEDRA, Go!
     TIMER_ON("GePolCavity::generatecavity_cpp");
     generatecavity_cpp(&maxts, &maxsph, &maxvert,
@@ -179,7 +196,7 @@ void GePolCavity::build(const std::string & suffix, int maxts, int maxsph, int m
                        xe, ye, ze, rin, mass,
 		       &averageArea, &probeRadius, &minimalRadius,
                        &nr_gen, &gen1, &gen2, &gen3,
-                nvert, vert, centr, pedra.str().c_str(), off.str().c_str());
+                nvert, vert, centr, f_pedra, f_off);
     TIMER_OFF("GePolCavity::generatecavity_cpp");
 
     // The "intensive" part of updating the spheres related class data members will be of course

src/pedra/pedra_cavity_interface.F90

@@ -57,50 +57,29 @@ subroutine generatecavity_cpp(maxts_, maxsph_, maxvert_,         &
 integer(c_int)  :: nr_gen_, gen1_, gen2_, gen3_
 integer(c_int)  :: nvert_(maxts_)
 real(c_double)  :: vert_(maxts_ * 30), centr_(maxts_ * 30)
-character(kind=c_char, len=1), intent(in) :: pedra_(*)
-character(kind=c_char, len=1), intent(in) :: off_(*)
+character(kind=c_char) :: pedra_
+character(kind=c_char) :: off_
 
 integer(c_int)    :: i, j, k, offset
 integer(c_int)    :: error_code
 integer(kind=regint_k) :: lvpri
 logical           :: pedra_file_exists
 real(c_double), allocatable :: vert(:, :, :), centr(:, :, :)
-character(kind=c_char, len=:), allocatable :: pedra
-character(kind=c_char, len=:), allocatable :: off
-integer :: l, nchars
 type(point_group) :: pgroup
 
-l = 1
-do
-    if (pedra_(l) == c_null_char) exit
-    l = l + 1
-end do
-nchars = l - 1  ! Exclude null character from Fortran string
-allocate(character(len=nchars) :: pedra)
-pedra = transfer(pedra_(1:nchars), pedra)
-
-l = 1
-do
-    if (off_(l) == c_null_char) exit
-    l = l + 1
-end do
-nchars = l - 1  ! Exclude null character from Fortran string
-allocate(character(len=nchars) :: off)
-off = transfer(off_(1:nchars), off)
-
 lvpri = 121201_regint_k
 pedra_file_exists = .false.
-inquire(file = pedra, exist = pedra_file_exists)
+inquire(file = pedra_, exist = pedra_file_exists)
 if (pedra_file_exists) then
    open(lvpri,                   &
-       file = pedra,       &
+       file = pedra_,       &
        status = 'unknown',       &
        form = 'formatted',       &
        access = 'sequential')
    close(lvpri, status = 'delete')
 end if
 open(lvpri,                      &
-    file = pedra,          &
+    file = pedra_,          &
     status = 'new',              &
     form = 'formatted',          &
     access = 'sequential')
@@ -135,7 +114,7 @@ subroutine generatecavity_cpp(maxts_, maxsph_, maxvert_,         &
 
 nesf = nesfp
 
-call polyhedra_driver(pgroup, vert, centr, masses_, lvpri, off, error_code)
+call polyhedra_driver(pgroup, vert, centr, masses_, lvpri, off_, error_code)
 
 ! Common block dark magic, it will disappear one day...
 nts_ = nts