diff --git a/astro.cpp b/astro.cpp index 39caad991..d59fc9679 100644 --- a/astro.cpp +++ b/astro.cpp @@ -103,11 +103,11 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, qint64 fre QDir writable = QStandardPaths::writableLocation (QStandardPaths::DataLocation); QString AzElFileName = QDir::toNativeSeparators(writable.absoluteFilePath ("azel.dat")); - astrosub_(&nyear, &month, &nday, &uth, &freq8, mygrid.toLatin1(), - hisgrid.toLatin1(), &azsun, &elsun, &azmoon, &elmoon, + astrosub_(&nyear, &month, &nday, &uth, &freq8, mygrid.toLatin1().constData(), + hisgrid.toLatin1().constData(), &azsun, &elsun, &azmoon, &elmoon, &azmoondx, &elmoondx, &ntsky, ndop, ndop00, &ramoon, &decmoon, &dgrd, &poloffset, &xnr, &techo, &width1, &width2, &bTx, - AzElFileName.toLatin1(), jpleph.toLatin1(), 6, 6, + AzElFileName.toLatin1().constData(), jpleph.toLatin1().constData(), 6, 6, AzElFileName.length(), jpleph.length()); QString message; diff --git a/lib/astrosub.f90 b/lib/astrosub.f90 index 85eb86244..963d2cb8b 100644 --- a/lib/astrosub.f90 +++ b/lib/astrosub.f90 @@ -6,7 +6,7 @@ subroutine astrosub(nyear,month,nday,uth8,freq8,mygrid,hisgrid, & implicit real*8 (a-h,o-z) character*6 mygrid,hisgrid,c1*1 character*6 AzElFileName*(*),jpleph*(*) - character*80 jpleph_file_name + character*256 jpleph_file_name logical*1 bTx common/jplcom/jpleph_file_name diff --git a/lib/jplsubs.f b/lib/jplsubs.f index 673690ec5..045e27817 100644 --- a/lib/jplsubs.f +++ b/lib/jplsubs.f @@ -19,7 +19,7 @@ C ***************************************************************** C NAMFIL IS THE EXTERNAL NAME OF THE BINARY EPHEMERIS FILE - CHARACTER*80 NAMFIL + CHARACTER*256 NAMFIL c NAMFIL='JPLEPH' @@ -76,7 +76,7 @@ C THE SUBROUTINE ALSO SETS THE VALUES OF NRECL, NRFILE, AND NAMFIL. INTEGER NMAX PARAMETER (NMAX = 1000) CHARACTER*6 TTL(14,3),CNAM(NMAX) - CHARACTER*80 NAMFIL,jpleph_file_name + CHARACTER*256 NAMFIL,jpleph_file_name DIMENSION SS(3) INTEGER IPT(3,13) common/jplcom/jpleph_file_name @@ -152,7 +152,7 @@ C C THE SUBROUTINE SETS THE VALUES OF NRECL, KSIZE, NRFILE, AND NAMFIL. SAVE - CHARACTER*80 NAMFIL,jpleph_file_name + CHARACTER*256 NAMFIL,jpleph_file_name common/jplcom/jpleph_file_name C ***************************************************************** @@ -272,7 +272,6 @@ C INTEGER LIST(12),IPT(39),DENUM COMMON/EPHHDR/CVAL,SS,AU,EMRAT,DENUM,NCON,IPT COMMON/STCOMX/KM,BARY,PVSUN - common/jplcom/jpleph_file_name C INITIALIZE ET2 FOR 'STATE' AND SET UP COMPONENT COUNT C @@ -695,7 +694,7 @@ C DATA FIRST/.TRUE./ CHARACTER*6 TTL(14,3),CNAM(NMAX) - CHARACTER*80 NAMFIL + CHARACTER*256 NAMFIL LOGICAL KM,BARY