Skip to content

Commit 9d78238

Browse files
author
David Crouse
committed
Update to version 6.1.1
1 parent 1affb86 commit 9d78238

File tree

281 files changed

+15489
-62698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+15489
-62698
lines changed

3rd_Party_Libraries/SGP4/Tracker_Library_Changes.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ Spacetrack Report #3," AIAA/AAS Astrodynamics Specialist Conference and
88
Exhibit, Guidance, Navigation, and Control and Co-located Conferences,
99
Keystone Colorado, 21-24 August 2006.
1010

11-
December 2024 David F. Crouse, Naval Research Laboratory, Washington D.C.
11+
Modifications have been made to make the code compile without warnings in
12+
Visual Studio and MinGW.
13+
14+
May 2025 David F. Crouse, Naval Research Laboratory, Washington D.C.

3rd_Party_Libraries/SGP4/cpp/SGP4.cpp

Lines changed: 158 additions & 143 deletions
Large diffs are not rendered by default.

3rd_Party_Libraries/direct/DIRect.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
#include <math.h>
77
#include "direct-internal.h"
88

9+
#ifdef _MSC_VER
10+
//Get rid of Spectre mitigation and inlining warnings.
11+
#pragma warning( disable : 5045 4710 4711)
12+
#endif
13+
914
/* Common Block Declarations */
1015

1116
/* Table of constant values */
@@ -79,7 +84,7 @@
7984
doublereal *levels = 0, *thirds = 0;
8085
doublereal epsfix;
8186
integer oldpos, minpos, maxpos, tstart, actdeep, ifreeold, oldmaxf;
82-
integer numfunc, version;
87+
integer version, numfunc=0;//Initializing to get rid of a warning.
8388
integer jones;
8489

8590
/* FIXME: change sizes dynamically? */

3rd_Party_Libraries/direct/DIRserial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
doublereal d__1;
2828

2929
/* Local variables */
30-
integer i__, j, helppoint, pos, kret;
30+
integer i__, j, helppoint, pos, kret=-1;//Initialize kret to get rid of a warning.
3131

3232
(void) logfile; (void) free; (void) maxfunc; (void) maxdeep; (void) oops;
3333
(void) delta; (void) sample;

3rd_Party_Libraries/direct/DIRsubrout.c

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
#include <math.h>
77
#include "direct-internal.h"
88

9+
#ifdef _MSC_VER
10+
//Get rid of Spectre mitigation and inlining warnings.
11+
#pragma warning( disable : 5045 4710 4711)
12+
#endif
13+
914
/* Table of constant values */
1015

1116
static integer c__1 = 1;
@@ -1503,12 +1508,23 @@ static integer isinbox_(doublereal *x, doublereal *a, doublereal *b, integer *n,
15031508
" Measure percentage wanted: %e\n",
15041509
imainver, isubver, isubsubver, *n, *eps, *maxf, *maxt,
15051510
*fglobal, *fglper, *volper, *sigmaper);
1506-
fprintf(logfile, *iepschange == 1
1507-
? "Epsilon is changed using the Jones formula.\n"
1508-
: "Epsilon is constant.\n");
1509-
fprintf(logfile, *algmethod == 0
1510-
? "Jones original DIRECT algorithm is used.\n"
1511-
: "Our modification of the DIRECT algorithm is used.\n");
1511+
if(*iepschange == 1) {
1512+
fprintf(logfile,"Epsilon is changed using the Jones formula.\n");
1513+
} else {
1514+
fprintf(logfile, "Epsilon is constant.\n");
1515+
}
1516+
// fprintf(logfile, *iepschange == 1
1517+
// ? "Epsilon is changed using the Jones formula.\n"
1518+
// : "Epsilon is constant.\n");
1519+
if(*algmethod == 0) {
1520+
fprintf(logfile,"Jones original DIRECT algorithm is used.\n");
1521+
} else {
1522+
fprintf(logfile,"Our modification of the DIRECT algorithm is used.\n");
1523+
}
1524+
1525+
// fprintf(logfile, *algmethod == 0
1526+
// ? "Jones original DIRECT algorithm is used.\n"
1527+
// : "Our modification of the DIRECT algorithm is used.\n");
15121528
}
15131529

15141530
i__1 = *n;

3rd_Party_Libraries/direct/Tracker_Library_Changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This code is taken from version 2.6.1 of the NLOpt library from
22
http://ab-initio.mit.edu/wiki/index.php/NLopt
3-
The code has been modified to get rid of most of the warning when
3+
The code has been modified to get rid of most of the warnings when
44
compiling. These include, for example, complaints that variables are unused
55
or are used prior to being initialized. Also the memory allocation and
66
freeing routines in the library have been changed to use the methods from

3rd_Party_Libraries/libais-0048ceb/Tracker_Library_Changes.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ Unused code was placed into ./Unused Code.zip, ./src/Unused Code.zip, and
44

55
In the file ./src/libais/Makefile-custom, the -fPIC C++ flag was added to
66
eliminate compile problems on some systems. The -DNDEBUG flasg was also
7-
added to eliminate parts related to debugging.
7+
added to eliminate parts related to debugging. A number of modifications
8+
were made to get rid of warnings when compiling in Visual Studio and MinGW.
89

910
The code was originally taken from
1011
https://github.com/schwehr/libais
1112

12-
November 2015 David F. Crouse, Naval Research Laboratory, Washington D.C.
13+
May 2025 David F. Crouse, Naval Research Laboratory, Washington D.C.

3rd_Party_Libraries/libais-0048ceb/src/libais/vdm.h

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@
6363
#ifndef LIBAIS_VDM_H_
6464
#define LIBAIS_VDM_H_
6565

66+
#ifdef _MSC_VER
67+
#pragma warning( push )
68+
//Get rid of warnings about missing operators. %DFC 2025
69+
#pragma warning( disable : 4626 5027 )
70+
#endif
71+
6672
#include <deque>
6773
#include <memory>
6874
#include <string>
@@ -207,7 +213,7 @@ class VdmStream {
207213
// Returns nullptr if there are not decoded messages currently available.
208214
std::unique_ptr<libais::AisMsg> PopOldestMessage();
209215

210-
int size() const { return messages_.size(); }
216+
int size() const { return static_cast<int>(messages_.size()); }
211217
bool empty() const { return messages_.empty(); }
212218

213219
private:
@@ -223,4 +229,9 @@ class VdmStream {
223229

224230
} // namespace libais
225231

232+
233+
#ifdef _MSC_VER
234+
#pragma warning( pop )
235+
#endif
236+
226237
#endif // LIBAIS_VDM_H_

3rd_Party_Libraries/liblbfgs/lib/lbfgs.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ distributing the effieicnt and explanatory implementation in an open source
6161
licence.
6262
*/
6363

64+
#ifdef _MSC_VER
65+
//Get rid of useless Spectre mitigation, inlining, and padding warnings.
66+
//Also get rid of the unreferenced formal parameter warning.
67+
#pragma warning( disable : 5045 4820 4710 4711 4100 )
68+
#endif
69+
6470
#ifdef HAVE_CONFIG_H
6571
#include <config.h>
6672
#endif/*HAVE_CONFIG_H*/
@@ -440,7 +446,8 @@ int lbfgs(
440446

441447
/* Report the progress. */
442448
if (cd.proc_progress) {
443-
if ((ret = cd.proc_progress(cd.instance, x, g, fx, xnorm, gnorm, step, cd.n, k, ls))) {
449+
ret = cd.proc_progress(cd.instance, x, g, fx, xnorm, gnorm, step, cd.n, k, ls);
450+
if (ret) {
444451
goto lbfgs_exit;
445452
}
446453
}
@@ -1060,7 +1067,8 @@ int line_search_morethuente(
10601067
}
10611068
}
10621069

1063-
return LBFGSERR_LOGICERROR;
1070+
//Unreachable code commented out.
1071+
// return LBFGSERR_LOGICERROR;
10641072
}
10651073

10661074

3rd_Party_Libraries/nrlmsise-00-bc9a2fe/Tracker Library Changes.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ was the case in the original Fortran code.
33

44
The code has been modified to use mxMalloc and mxFree, which are preferred
55
in Matlab over malloc and free. Also, printf statements have been replaced
6-
with the appropriate native. Matlab functions.
6+
with the appropriate native. Matlab functions, and some variables were
7+
renamed to get rid of warnings about shadowing global variables.
78

8-
June 2016 David F. Crouse, Naval Research Laboratory, Washington D.C.
9+
May 2025 David F. Crouse, Naval Research Laboratory, Washington D.C.

0 commit comments

Comments
 (0)