ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-01 23:20:59 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Correct Monte Carlo compiler error on CentOS 7

Browse Source 
Also change the Cannon sim monte_post jobs to use mc_read/write instead
of tc_read/write

Refs #396
This commit is contained in:
Derek Bankieris 2017-03-24 08:11:32 -05:00
parent 80ab0767e2
commit 2335f6bb69
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_sims/Cannon/models/cannon/optim/src/cannon_post_master.c
View File

@ -20,7 +20,7 @@ int cannon_post_master(
(void)C ; (void)C ;
/* Read slave's results */ /* Read slave's results */
tc_read( mc_get_connection_device(),(char*) &C_curr, sizeof(CANNON_AERO) ); mc_read( (char*) &C_curr, sizeof(CANNON_AERO) );
fprintf(stderr, "%03d> F(", mc_get_current_run()); fprintf(stderr, "%03d> F(", mc_get_current_run());
amoeba_print_point(4, A->curr_point) ; amoeba_print_point(4, A->curr_point) ;

2
trick_sims/Cannon/models/cannon/optim/src/cannon_post_slave.c
View File

@ -13,6 +13,6 @@ int cannon_post_slave(
{ {
/* Send slave results */ /* Send slave results */
tc_write( mc_get_connection_device(), (char*) C, sizeof(CANNON_AERO) ); mc_write( (char*) C, sizeof(CANNON_AERO) );
return(0) ; return(0) ;
} }

3
trick_source/sim_services/MonteCarlo/MonteCarlo_receive_results.cpp
View File

@ -55,7 +55,8 @@ void Trick::MonteCarlo::handle_initialization(Trick::MonteSlave& slave) {
} }
size = ntohl(size); size = ntohl(size);
char name[size + 1] = {}; char name[size + 1];
name[size] = '\0';
if (tc_read(&connection_device, name, size) != size) { if (tc_read(&connection_device, name, size) != size) {
set_disconnected_state(slave); set_disconnected_state(slave);
return; return;