Commit Graph

541 Commits

Author SHA1 Message Date
Derek Bankieris
b5b46d9c75 Use immediate instead of deferred assignment when copying TRICK_SYSTEM_CXXFLAGS to TRICK_SYSTEM_CFLAGS 2016-10-06 16:00:22 -05:00
Derek Bankieris
abc7072918 Return the rediculous "feature" of automagically including -I$(PWD)/../include in the compiler flags 2016-10-06 15:37:43 -05:00
Derek Bankieris
47c8c2efb9 Removed dead code 2016-10-06 15:04:16 -05:00
John M. Penn
7544f4f96a Stop DPX makefile from trying to make catalog.xml. Ref #324 2016-10-06 14:53:36 -05:00
Derek Bankieris
054245f968 Forgot to remove this debugging print out before the last commit 2016-10-06 14:28:06 -05:00
Derek Bankieris
f161ddb18c Made everything about Trick's build process better 2016-10-06 13:54:06 -05:00
John M. Penn
edbac4cc11 Add corrected catalog.xml that contains a relative base. 2016-10-05 15:35:07 -05:00
John M. Penn
58b32d21af Delete files used to generate catalog.xml. Ref #324 2016-10-05 15:34:14 -05:00
John M. Penn
740a3984df Merge branch 'master' of https://github.com/nasa/trick 2016-10-05 14:25:04 -05:00
John M. Penn
aa859d1579 In DP_Solar_AZ_EL.xml file, units attributes are changed from d to degree. Ref #323 2016-10-05 14:24:44 -05:00
Alex Lin
55aa3eef59 Merge pull request #321 from ddj116/montevar_setters
Added MonteVar setters where appropriate.  Looks good to me.
2016-10-04 08:12:36 -05:00
Dan D. Jordan
9e0f0ba85a Added MonteVar setters where appropriate
Added set_unit mechanism to MonteVar baseclass. Added MonteVar's derived
classes setters where appropriate to facilitate changing inputs after
the instance of MonteVar has already been constructed. Fleshed out
MonteVarFile destructor to remove memory leaks.
2016-10-03 14:57:11 -05:00
John M. Penn
7300c0759f get rid of a bunch of unnecessary imports. Ref #320 2016-09-30 14:51:55 -05:00
John M. Penn
a23702b4a9 Initial commit of Java, Cannonball, variable server client. Ref #320 2016-09-30 14:33:16 -05:00
John M. Penn
ab9ff1c38e Deleted old unmaintained graphics code 2016-09-30 11:33:07 -05:00
Alex Lin
4f0a0bc895 Merge branch '17.0' 2016-09-28 14:59:49 -05:00
Alex Lin
d60601d9b5 Variable Server could not find variable related to trick_sys.sched #315
Added a "-n" argument when calling ICG on Trick core.  I had previously removed
the "friend attr<class>" lines from Trick core classes.  The -n argument
instructs ICG to not create the offsetof calls that require the friend function
and to process protected and private variables by default.
2016-09-28 14:47:42 -05:00
dbankieris
29a09cc56f Set variable to nothing instead of using undefine, which is not available before make 3.82 2016-09-26 11:25:15 -05:00
Alex Lin
5c117bcfe3 python3 execution of standalone monte_input #314
In the monte carlo input files I added a test for python 2/3.  If we are 3 run
exec(open("file").read()), else run execfile("file")
2016-09-26 09:26:43 -05:00
Alex Lin
2eadf217a9 c preprocessor statements don't work in Trick header blocks in header files #317
Copied the block of code that sends header file comments through the preprocessor from
15.x to trunk.  This block was left out and is now used by both headers and source files.
2016-09-26 08:35:26 -05:00
Derek Bankieris
e835ecf515 Improved trickify.mk #309 2016-09-19 16:03:50 -05:00
Alex Lin
bbba26e057 Merge branch '17.0' 2016-09-16 09:50:12 -05:00
Alex Lin
00a0e8be44 ICG exclude of class member variables now defines incorrect memory offsets in io_src #311
Missed some bitfield offset calculations.
2016-09-16 09:46:03 -05:00
Derek Bankieris
ba59606b1d Added TRICK_PYTHON_PATH environment variable #313 2016-09-16 09:20:11 -05:00
Alex Lin
c134ffea8f Merge branch '17.0' 2016-09-16 08:43:47 -05:00
Alex Lin
ae07b26243 ICG exclude of class member variables now defines incorrect memory offsets in io_src #311
Added back the code that set the offset of variables with the offsetof function. This
code is running by default.  Any code that includes #ifndef TRICK_ICG in
classes/structures will want this on.

Added a flag to ICG that allows us to turn off writing of these lines.  If the flag
is present, ICG may write out io_src code for private/protected variables that it could
not reach if an offsetof function was required.  Code cannot have any #ifndef TRICK_ICG
present in classes/structures for this to work.
2016-09-16 08:39:37 -05:00
Alex Lin
b88ff45f94 Bad units specification [dB] #312
Added a conversion of [dB] to [1] for use in udunits.
2016-09-15 15:24:19 -05:00
Alex Lin
b2432fd269 Trickified Project Libraries #309
We were ignoring classes completely if it was found in to be in an external library
directory.  We need to partially process it so it is included in the ICG generated
class_map file which registers attributes of classes and eventually works it's way
to populating the S_sie file.
2016-09-15 14:48:23 -05:00
John M. Penn
fc77fbc216 Fix tv file which was horked somehow 2016-09-14 17:17:44 -05:00
John M. Penn
f186b91afc Add comments that explain the coordinate systems and transformations in SunDisplay. Ref #310 2016-09-14 17:16:42 -05:00
Derek Bankieris
2aa0287fb9 Generic makefile for building a Trickified project library #309 2016-09-14 11:26:29 -05:00
Alex Lin
9801e3d210 ICG not setting default checkpointing io correctly. #308
If a checkpoint_io field is found we were or'ing this in to bits already
set by default.  Clear the bits first.
2016-09-14 09:38:28 -05:00
Alex Lin
256c83a876 ICG not setting default checkpointing io correctly. #308
Changed the default io value from 3 which left out checkpointing to 15 which does
include checkpointing.
2016-09-13 16:37:59 -05:00
Alex Lin
54553b5fa9 Merge pull request #306 from iamthad/master
Fix filename output in attach_units for Python 3
2016-09-12 07:53:49 -05:00
Thadeus Fleming
5027c02c51 Fix filename output in attach_units for Python 3 2016-09-11 14:21:37 -05:00
Alex Lin
9e5383bac0 Merge pull request #305 from ddj116/set_num_runs_fix
Fixed indexing problem when reducing number of monte carlo runs
2016-09-09 14:11:21 -05:00
Dan D. Jordan
70a4ad9e24 Fixed indexing problem when reducing number of monte carlo runs
When runs reduced via successive calls to set_num_runs, instead of using
pop_front() and front(), use pop_back() and back()

Refs #304
2016-09-08 13:53:44 -05:00
Derek Bankieris
261af7930e Removed prerequisites from .NOTPARALLEL #303 2016-09-07 10:27:51 -05:00
Alex Lin
5903209e00 Create a trick-config script #298
Need to add trick-config to list of executables to remove during uninstall.
2016-09-07 09:40:31 -05:00
Alex Lin
2918662767 Create a trick-config script #298
Created trick-config that can print the version, installation prefix,
and compile and link flags that Trick defines.
2016-09-07 09:33:03 -05:00
Alex Lin
0eab3d2d4e DP file in SIM_ball_L1 does not work #302
So the previous commit works with one plot widget but not the other.  Now it
works for both.
2016-09-07 09:31:52 -05:00
Alex Lin
53f0e33049 DP file in SIM_ball_L1 does not work #302
Everything was old and now wrong in this file.  Wrong start/stop times,
wrong X and Y axis min/max values, wrong units for time, and wrong
variable names.
2016-09-07 07:20:24 -05:00
Alex Lin
3be6715eba Merge tag '17.0.3'
Adding check for NULL char pointer before converting to string.
2016-09-06 13:58:54 -05:00
Alex Lin
c4a32600cc Trick View: Can't set variables with -- units #301
Test before trying to convert NULL char * to string.
2016-09-06 13:53:37 -05:00
Alex Lin
eaa6f796d9 Merge tag '17.0.3'
Converting units incoming from the variable server.
2016-09-06 13:22:09 -05:00
Alex Lin
b32015a1ad Trick View: Can't set variables with -- units #301
Called map_trick_units_to_udunits to convert incoming units to udunits.
2016-09-06 13:15:36 -05:00
John Penn
753d821329 Fix compilers warnings. Ref #300 2016-09-02 17:01:07 -05:00
Alex Lin
919a8e2068 Variable using an enumeration as array index causes infinite loop #299
Once we determine the type of a variable we should stop processing the
AST tree at that point. We do this for record types but not for the
built in types.  Changed the return value of the process builtin
function to false so we stop processing.
2016-09-01 16:06:33 -05:00
Alex Lin
066554b2f7 Merge pull request #297 from ddj116/get_variable
MonteCarlo add_variable duplicate protection and get_variable functionality
2016-08-30 11:00:16 -05:00
Alex Lin
fa4664c4ea Move the loop that waits for scheduled threads to finish out of advance_sim_time #292
2 problems found.  Syncing scheduled threads was not happening at all because the job
was not being rescheduled.  Did not want to deal with changing job call times so I
called the new scheuduled_thread_sync routine from advance_sim_time.  That's where
it started, it'll be fine.

Also found that I was resetting job complete flags too aggressively.  The check to
test if the thread is ready to run was missing.  Added that check back in.
2016-08-30 10:56:18 -05:00