ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-22 09:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use include paths relative to TRICK_HOME/include in Cannon sims. Ref #438

Browse Source
This commit is contained in:
John M. Penn 2017-06-06 13:04:12 -05:00
parent af6b8cbea8
commit 876075e325
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_sims/Cannon/models/cannon/gravity/include/cannon.h
View File

@ -4,7 +4,7 @@ PURPOSE: (Represent the state and initial conditions of a cannonball)
**************************************************************************/ **************************************************************************/
#ifndef CANNON_H #ifndef CANNON_H
#define CANNON_H #define CANNON_H
#include "sim_services/Integrator/include/regula_falsi.h" #include "trick/regula_falsi.h"
#include "trick_utils/comm/include/tc.h" #include "trick_utils/comm/include/tc.h"
#include "trick_utils/comm/include/tc_proto.h" #include "trick_utils/comm/include/tc_proto.h"

2
trick_sims/Cannon/models/cannon/gravity/src/cannon_ec_integ.c
View File

@ -2,7 +2,7 @@
PURPOSE: ( Integration Job for Euler-Cromer Example ) PURPOSE: ( Integration Job for Euler-Cromer Example )
*****************************************************************************/ *****************************************************************************/
#include "sim_services/Integrator/include/integrator_c_intf.h" #include "trick/integrator_c_intf.h"
#include "../include/cannon.h" #include "../include/cannon.h"
int cannon_ec_integ( CANNON* C ) { int cannon_ec_integ( CANNON* C ) {

6
trick_sims/Cannon/models/cannon/gravity/src/cannon_init.c
View File

@ -5,16 +5,14 @@ PURPOSE: (Set the initial data values)
/* Model Include files */ /* Model Include files */
#include <math.h> #include <math.h>
#include "../include/cannon.h" #include "../include/cannon.h"
#include "sim_services/include/Flag.h" #include "trick/Flag.h"
/* default data job */ /* default data job */
int cannon_default_data( CANNON* C ) { int cannon_default_data( CANNON* C ) {
const double PI = 3.1415926535;
C->acc[0] = 0.0; C->acc[0] = 0.0;
C->acc[1] = -9.81; C->acc[1] = -9.81;
C->init_angle = PI/6 ; C->init_angle = M_PI/6 ;
C->init_speed = 50.0 ; C->init_speed = 50.0 ;
C->pos0[0] = 0.0 ; C->pos0[0] = 0.0 ;
C->pos0[1] = 0.0 ; C->pos0[1] = 0.0 ;

2
trick_sims/Cannon/models/cannon/gravity/src/cannon_numeric.c
View File

@ -3,7 +3,7 @@ PURPOSE: ( Numeric integration for SIM_cannon_numeric )
*****************************************************************************/ *****************************************************************************/
#include <stdio.h> #include <stdio.h>
#include "../include/cannon_numeric.h" #include "../include/cannon_numeric.h"
#include "sim_services/Integrator/include/integrator_c_intf.h" #include "trick/integrator_c_intf.h"
/* The cannonball sim's derivative job */ /* The cannonball sim's derivative job */
int cannon_deriv( CANNON* C ) { int cannon_deriv( CANNON* C ) {