Skip to content

Building with newgcc, preparing for code coverage checks #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JeffreyBroll wants to merge 8 commits into from
Closed

Building with newgcc, preparing for code coverage checks #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
feac639
Kill bogus forward declarations in Lgm_QuadPack*.c
JeffreyBroll Jun 24, 2026
1f2a697
Finish BwFunc prototypes to make SummersDiffCoeff get through newer gcc
JeffreyBroll Jun 24, 2026
7a1f19d
this source file is haunted
JeffreyBroll Jun 24, 2026
8df836b
Type error fixed
JeffreyBroll Jun 24, 2026
d9b097d
completed forward declarations in xvgifwr2, look behind the cobwebs
JeffreyBroll Jun 24, 2026
f302342
continuing the unpraxisification
JeffreyBroll Jun 24, 2026
1a2c7fb
fixing same type error as in Tsyg2007
JeffreyBroll Jun 24, 2026
766e7f4
gitignore all the coverage thingos
JeffreyBroll Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ libLanlGeoMag/.deps/
*.o
*.lo
*.png
*.gcno
/Makefile
Tools/Makefile
tests/Makefile
libLanlGeoMag/Makefile
libLanlGeoMag/Lgm/Makefile
libLanlGeoMag/EopData/Makefile
libLanlGeoMag/*.gcno
/build-aux/
/autom4te.cache/
configure
Expand Down
4 changes: 2 additions & 2 deletions libLanlGeoMag/Lgm/Lgm_SummersDiffCoeff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ typedef struct Lgm_SummersInfo {
double aStarEq; //!< Summer's \f$ \alpha^* \f$ value which is \f$ \Omega_e/\omega^2_{pe} \f$.
// double dB; //!< Value of wave amplitude [nT].
void *BwFuncData; //!< Pointer to data that may be needed by BwFunc()
double (*BwFunc)(); //!< Function to return Bw as a function of latitude.
double (*BwFunc)(double, void *); //!< Function to return Bw as a function of latitude.
double Omega_eEq; //!< Equatorial gyrofrequency of electrons [Hz].
double Omega_SigEq; //!< Equatorial gyrofrequency of species [Hz].
double w1; //!< Lower frequency cutoff [Hz].
Expand Down Expand Up @@ -93,7 +93,7 @@ typedef struct Lgm_SummersInfo {
int Lgm_SummersDxxBounceAvg( int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)( double, void * ), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, int WaveMode, int Species, double MaxWaveLat, double *Daa_ba, double *Dap_ba, double *Dpp_ba);
//int Lgm_GlauertAndHorneDxxBounceAvg( int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)( double, void * ), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, double x1, double x2, int numberOfWaveNormalAngleDistributions, double *xm, double *dx, double *weightsOnWaveNormalAngleDistributions,int WaveMode, int Species, double MaxWaveLat, double *Daa_ba, double *Dap_ba, double *Dpp_ba);
int Lgm_GlauertAndHorneDxxBounceAvg( int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)( double, void * ), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, double x1, double x2, int numberOfWaveNormalAngleDistributions, double *xm, double *dx, double *weightsOnWaveNormalAngleDistributions,int WaveMode, int Species, double MaxWaveLat, int nNw, int nPlasmaParameters, double aStarMin, double aStarMax, double *Nw, double *Daa_ba, double *Dap_ba, double *Dpp_ba);
int Lgm_SummersDxxDerivsBounceAvg( int DerivScheme, double ha, int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, int WaveMode, int Species, double MaxWaveLat, double *dDaa, double *dDap);
int Lgm_SummersDxxDerivsBounceAvg( int DerivScheme, double ha, int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(double, void *), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, int WaveMode, int Species, double MaxWaveLat, double *dDaa, double *dDap);
double Lgm_ePlasmaFreq( double Density );
double Lgm_GyroFreq( double q, double B, double m );
double CdipIntegrand_Sb( double Lat, _qpInfo *qpInfo );
Expand Down
6 changes: 3 additions & 3 deletions libLanlGeoMag/Lgm_QuadPack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ int *last;


double area, abseps, area1, area12, area2, a1;
double a2, b1, b2, correc=0.0, defabs, defab1, defab2, d1mach();
double a2, b1, b2, correc=0.0, defabs, defab1, defab2;
double dres, epmach, erlarg=0.0, erlast, errbnd, errmax;
double error1, error2, erro12, errsum, ertest=0.0, oflow, resabs, reseps;
double res3la[4], rlist2[53], small=0.0, uflow;
Expand Down Expand Up @@ -928,7 +928,7 @@ int dqelg(int n, double epstab[], double *result, double *abserr, double res3la[



double delta1, delta2, delta3, d1mach();
double delta1, delta2, delta3;
double epmach, epsinf, error, err1, err2, err3, e0, e1, e1abs, e2, e3;
double oflow, res, ss, tol1, tol2, tol3;
int i, ib, ib2, ie, indx, k1, k2, k3, limexp, newelm, num;
Expand Down Expand Up @@ -1203,7 +1203,7 @@ double *resasc; /* */



double absc, centr, dhlgth, d1mach();
double absc, centr, dhlgth;
double epmach, fc, fsum, fval1, fval2, fv1[11], fv2[11], hlgth;
double resg, resk, reskh, uflow;
int j, jtw, jtwm1;
Expand Down
2 changes: 1 addition & 1 deletion libLanlGeoMag/Lgm_QuadPack2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ int *last;


double area, abseps, area1, area12, area2, a1;
double a2, b1, b2, correc=0.0, defabs, defab1, defab2, d1mach();
double a2, b1, b2, correc=0.0, defabs, defab1, defab2;
double dres, epmach, erlarg=0.0, erlast, errbnd, errmax;
double error1, error2, erro12, errsum, ertest=0.0, oflow, resabs, reseps;
double res3la[4], rlist2[53], small=0.0, uflow;
Expand Down
2 changes: 1 addition & 1 deletion libLanlGeoMag/Lgm_QuadPack3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ int *last;


double area, abseps, area1, area12, area2, a1;
double a2, b1, b2, correc=0.0, defabs, defab1, defab2, d1mach();
double a2, b1, b2, correc=0.0, defabs, defab1, defab2;
double dres, epmach, erlarg=0.0, erlast, errbnd, errmax;
double error1, error2, erro12, errsum, ertest=0.0, oflow, resabs, reseps;
double res3la[4], rlist2[53], uflow;
Expand Down
6 changes: 3 additions & 3 deletions libLanlGeoMag/Lgm_SummersDiffCoeff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ double Lgm_GyroFreq( double q, double B, double m ) {
* \date 2011
*
*/
int Lgm_SummersDxxBounceAvg( int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, int WaveMode, int Species, double MaxWaveLat, double *Daa_ba, double *Dap_ba, double *Dpp_ba) {
int Lgm_SummersDxxBounceAvg( int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(double, void *), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, int WaveMode, int Species, double MaxWaveLat, double *Daa_ba, double *Dap_ba, double *Dpp_ba) {

double T, a, b, E0, Omega_eEq, Omega_SigEq, Beq, Rho;
double epsabs, epsrel, abserr, work[2002], points[10];
Expand Down Expand Up @@ -434,7 +434,7 @@ int Lgm_SummersDxxBounceAvg( int Version, double Alpha0, double Ek, double L,
* spread in wave normal angles for that component
*/

int Lgm_GlauertAndHorneDxxBounceAvg( int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, double x1, double x2, int numberOfWaveNormalAngleDistributions, double *xmArray, double *dxArray, double *weightsOnWaveNormalAngleDistributions, int WaveMode, int Species, double MaxWaveLat, int nNw, int nPlasmaParameters, double aStarMin, double aStarMax, double *Nw, double *Daa_ba, double *Dap_ba, double *Dpp_ba) {
int Lgm_GlauertAndHorneDxxBounceAvg( int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(double, void *), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, double x1, double x2, int numberOfWaveNormalAngleDistributions, double *xmArray, double *dxArray, double *weightsOnWaveNormalAngleDistributions, int WaveMode, int Species, double MaxWaveLat, int nNw, int nPlasmaParameters, double aStarMin, double aStarMax, double *Nw, double *Daa_ba, double *Dap_ba, double *Dpp_ba) {


double T, a, b, E0, Omega_eEq, Omega_SigEq, Beq, Rho;
Expand Down Expand Up @@ -684,7 +684,7 @@ printf("done finding integral\n");
* \date 2011
*
*/
int Lgm_SummersDxxDerivsBounceAvg( int DerivScheme, double ha, int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, int WaveMode, int Species, double MaxWaveLat, double *dDaa, double *dDap) {
int Lgm_SummersDxxDerivsBounceAvg( int DerivScheme, double ha, int Version, double Alpha0, double Ek, double L, void *BwFuncData, double (*BwFunc)(double, void *), double n1, double n2, double n3, double aStarEq, int Directions, double w1, double w2, double wm, double dw, int WaveMode, int Species, double MaxWaveLat, double *dDaa, double *dDap) {

double a, h, H, faa[7], fap[7], Daa_ba, Dap_ba, Dpp_ba;
int i, N;
Expand Down
2 changes: 1 addition & 1 deletion libLanlGeoMag/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ libLanlGeoMag_la_SOURCES = Lgm_AlphaOfK.c Lgm_DFI_RBF.c Lgm_Vec_RBF.c Lgm_B_Fro
TraceToMinRdotB.c Lgm_TraceToMirrorPoint.c TraceToSMEquat.c T01S.c Tsyg_T01s.c T02.c Tsyg_T02.c TS04.c Tsyg2004.c \
Lgm_PolyRoots.c Lgm_SummersDiffCoeff.c Lgm_B_Dungey.c Tsyg2007.c TS07.c Tsyg1996.c T96.c TU82.c\
W.c Lgm_InitMagEphemInfo.c Lgm_AE8_AP8.c OP77.c OP88.c OlsenPfitzerDynamic.c OlsenPfitzerStatic.c IsoTimeStringToDateTime.c \
size.c Lgm_FluxToPsd.c xvgifwr2.c praxis.c Lgm_SphHarm.c Lgm_McIlwain_L.c Lgm_ElapsedTime.c Lgm_KdTree.c\
size.c Lgm_FluxToPsd.c xvgifwr2.c Lgm_SphHarm.c Lgm_McIlwain_L.c Lgm_ElapsedTime.c Lgm_KdTree.c\
Lgm_ComputeLstarVersusPA.c Lgm_MagEphemWrite.c Lgm_MagEphemWriteHdf.c brent.c Lgm_CdipMirrorLat.c ComputeI_FromMltMlat.c ComputeI_FromMltMlat2.c \
Lgm_QinDenton.c Lgm_DiffCoeff_param.c Lgm_AE_index.c Lgm_Misc.c Lgm_HDF5.c Lgm_GradB.c Lgm_GradBvec.c Lgm_GradBvec2.c Lgm_VelStep.c Lgm_Utils.c DynamicMemory.h \
Lgm_Metadata.c Lgm_PriorityQueue.c TraceToYZPlane.c Lgm_InitNrlMsise00.c Lgm_NrlMsise00.c Lgm_Coulomb.c\
Expand Down
2 changes: 1 addition & 1 deletion libLanlGeoMag/TA16.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ int Lgm_SetCoeffs_TA16(long int Date, double UTC, LgmTA16_Info *ta) {
if ( (fp = fopen( datafile, "r" )) != NULL ) {
// to start with, just loop over... should we actually
// be interpolating linearly between values?
while ( fgets( &tmpstr, 1300, fp ) != NULL ) {
while ( fgets( tmpstr, 1300, fp ) != NULL ) {
ncols = sscanf( tmpstr, "%d %d %d %d %lf %lf %lf %lf %lf %lf %lf %lf %lf %d %d %lf %lf %lf %lf %lf",
&year, &doy, &hour, &minute, &bx_av, &by_av, &bz_av,
&vx, &vy, &vz, &nden, &temp, &symh, &IMFflag, &SWflag,
Expand Down
10 changes: 5 additions & 5 deletions libLanlGeoMag/Tsyg2007.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,15 @@ void Lgm_SetCoeffs_TS07( long int Date, double UTC, LgmTsyg2007_Info *t ){
if ( (fp = fopen( Filename, "r" )) != NULL ) {

for ( k=1; k<=101; k++ ) {
fgets( &tmpstr, 512, fp);
sscanf( &tmpstr, "%lf", &t->A[k] );
fgets( tmpstr, 512, fp);
sscanf( tmpstr, "%lf", &t->A[k] );
//fscanf( fp, "%lf%*[\n]\n", &t->A[k] );
//printf("t->A[%d] = %g\n", k, t->A[k]);
}
while ((!foundP) && (!feof(fp))) {
fgets( &tmpstr, 512, fp);
if ( strstr( &tmpstr, p_str) != NULL ) { //check line for Pdyn, if present read value
sscanf( &tmpstr, "%*s %lf", &t->Pdyn);
fgets( tmpstr, 512, fp);
if ( strstr( tmpstr, p_str) != NULL ) { //check line for Pdyn, if present read value
sscanf( tmpstr, "%*s %lf", &t->Pdyn);
foundP = TRUE;
}
}
Expand Down
Loading
Loading