Increasing filename size to 1024 bytes.

To handle conda long build prefix.

Author: pacesm

eoxmagmod/eoxmagmod/pyqd_eval_qdlatlon.h

@@ -92,11 +92,11 @@ static PyObject* eval_qdlatlon(PyObject *self, PyObject *args, PyObject *kwdict)
         goto exit;
 
     // check the filename length
-    if (strlen(model_fname) > get_max_fname_lenght()) {
+    if (strlen(model_fname) > MAX_PATH_LENGTH) {
         PyErr_Format(
             PyExc_RuntimeError,
             "Filename is too long and exceeds the maximum allowed %d bytes! filename = %s",
-            get_max_fname_lenght(), model_fname
+            MAX_PATH_LENGTH, model_fname
         );
         goto exit;
     }

qdipole/apexsh.f90

@@ -149,7 +149,7 @@ module apxshmodule
 !   Re = Mean radius of Earth in km
 !   ecc2 = squared eccentricity of ellipsoidal Earth
 
-       character(256)           :: datafile
+       character(1024)          :: datafile
        real(4)                  :: epoch
        real(4)                  :: altlastq, altlastg
        logical                  :: loadflag = .true.
@@ -164,7 +164,7 @@ subroutine loadapxsh(datafilenew,epochnew)
 
     implicit none
 
-    character(256)              :: datafilenew, datafilelast=''
+    character(1024)             :: datafilenew, datafilelast=''
     real(4)                     :: epochnew, epochlast=-999.0
     real(8)                     :: we0, we1
     integer(4)                  :: iepoch0, iepoch1, iterm, icoord

qdipole/cqdipole.c

@@ -36,9 +36,6 @@
 #include <string.h>
 #include "cqdipole.h"
 
-#define MAX_PATH_LENGTH 256
-
-
 static int check_string_lenght(const char *srt, const size_t size)
 {
     return strlen(srt) > size;
@@ -53,12 +50,6 @@ static void copy_string(char *dst, const char *src, const size_t size)
 }
 
 
-size_t get_max_fname_lenght()
-{
-    return MAX_PATH_LENGTH;
-}
-
-
 void eval_mlt_(double*, const double*, const double*, const int*);
 
 int c_eval_mlt(double *t_mlt, const double *qdlon, const double *t_mjd2k,

qdipole/cqdipole.h

@@ -31,12 +31,7 @@
 #ifndef CQDIPOLE_H
 #define CQDIPOLE_H
 
-/**
- * @brief Get filename size limit.
- * @returns maximum length of the filename path
- */
-
-size_t get_max_fname_lenght();
+#define MAX_PATH_LENGTH 1024
 
 
 /**

qdipole/eval_qdlatlon.f90

@@ -29,7 +29,7 @@
 !    gclat    vector of geocentric latitudes (degrees)
 !    gdlon    vector of geocentric longitudes (degrees)
 !    n_data   number of points, i.e., vector size
-!    coeff_file  path to the coefficients (string up to 256 characters)
+!    coeff_file  path to the coefficients (string up to 1024 characters)
 !
 !  OUTPUT ARGUMENTS
 !    qdlat     array of Quasi-Dipole latitudes
@@ -50,7 +50,7 @@
 !    gclat    vector of geocentric latitudes (degrees)
 !    gdlon    vector of geocentric longitudes (degrees)
 !    n_data   number of points, i.e., vector size
-!    coeff_file  path to the coefficients (string up to 256 characters)
+!    coeff_file  path to the coefficients (string up to 1024 characters)
 !
 !  OUTPUT ARGUMENTS
 !    qdlat     array of Quasi-Dipole latitudes
@@ -72,7 +72,7 @@ subroutine eval_qdlatlon(qdlat, qdlon, t_dy, gcrad, gclat, gclon,&
       real*4  gdalt, gdlat, gdlon, xqdlat, xqdlon, xf1(2), xf2(2), xf
       real*4  epoch, epoch_limit, epoch_old
       integer*4  vecflag, n_data, i
-      character*256 coeff_file
+      character*1024 coeff_file
       parameter(epoch_limit = 1./365.25, vecflag = 0)
 
       epoch_old = -9999.9

qdipole/qdlatlon_test.c

@@ -64,9 +64,9 @@ int main(int argc, char* argv[])
     }
     printf("Using: %s\n", basename(fname));
 
-    if (strlen(fname) > get_max_fname_lenght())
+    if (strlen(fname) > MAX_PATH_LENGTH)
     {
-        fprintf(stderr, "ERROR: Filename is too long and exceeds the maximum allowed %d bytes! filename = %s\n", get_max_fname_lenght(), fname);
+        fprintf(stderr, "ERROR: Filename is too long and exceeds the maximum allowed %d bytes! filename = %s\n", MAX_PATH_LENGTH, fname);
         return 1;
     }