ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-30 08:03:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'nasa:master' into master

Browse Source
This commit is contained in:
cherpin00 2021-07-27 13:37:19 -05:00 committed by GitHub
commit d3951d62ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/documentation/simulation_capabilities/Integrator.md
View File

@ -85,9 +85,10 @@ If a developer wishes to use their own integration scheme, then the <i> integrat
should be reviewed so that the proper interfaces can be maintained. The <i> integrate() </i> source code is should be reviewed so that the proper interfaces can be maintained. The <i> integrate() </i> source code is
located in the ${TRICK_HOME}/trick_source/sim_services/integ/integrate.c file. located in the ${TRICK_HOME}/trick_source/sim_services/integ/integrate.c file.
@section LEVEL3 Integrator Control Inputs ### Integrator Control Inputs
There can be any number of <i> integration </i> class jobs listed within the S_define file; There can be any number of <i> integration </i> class jobs listed within the S_define file;
each integration job should have an associated <i> INTEGRATOR </i> data structure declaration. each integration job should have an associated <i> IntegLoop </i> declaration.
The available inputs for state integration control are listed in Table 18. The available inputs for state integration control are listed in Table 18.
Table 18 State Integration Control Inputs Table 18 State Integration Control Inputs

3
trick_sims/Ball/models/ball/L3/src/ball_ensemble_collision.c
View File

@ -19,7 +19,8 @@ double ball_ensemble_collision( BSTATE * states[2] ) {
double event_tgo; double event_tgo;
event_tgo = BIG_TGO; event_tgo = BIG_TGO;
for (int i=0 ; i < 2 ; i++) { int i;
for (i=0 ; i<2 ; i++) {
tgo = ball_ceiling( states[i]); tgo = ball_ceiling( states[i]);
if (tgo < event_tgo) event_tgo = tgo; if (tgo < event_tgo) event_tgo = tgo;
tgo = ball_floor( states[i] ) ; tgo = ball_floor( states[i] ) ;