Commit 7cd2956d authored by Nicolas Van der Noot's avatar Nicolas Van der Noot
Browse files

mbs_app/user_file_generation: cmake correction

parent d9cdcd12
......@@ -8,7 +8,7 @@
*
* Universite catholique de Louvain, Belgium
*
* Last update : Wed Sep 9 13:31:19 2015
* Last update : Tue Sep 15 20:40:18 2015
* --------------------------------------------------------
*
*/
......
......@@ -8,7 +8,7 @@
*
* Universite catholique de Louvain, Belgium
*
* Last update : Tue May 19 13:31:40 2015
* Last update : Tue Sep 15 20:40:18 2015
* --------------------------------------------------------
*
*/
......@@ -51,7 +51,7 @@ void mbs_delete_user_model(UserModel* um)
{
int ind;
int ind_state_value = 0;
int ind_state_value = 1;
um->Spring.K = gen->user_models->user_model_list[0]->parameter_list[0]->value_list[0];
um->Spring.C = gen->user_models->user_model_list[0]->parameter_list[1]->value_list[0];
......@@ -68,7 +68,7 @@ void mbs_delete_user_model(UserModel* um)
um->Motor.rho = gen->user_models->user_model_list[2]->parameter_list[4]->value_list[0];
for(ind=0; ind<gen->user_models->user_model_list[2]->parameter_list[5]->n_value; ind++)
{
um->Motor.i[ind] = ind_state_value;
um->Motor.i[ind+1] = ind_state_value;
ind_state_value++;
}
......
......@@ -8,7 +8,7 @@
*
* Universite catholique de Louvain, Belgium
*
* Last update : Tue May 19 13:31:40 2015
* Last update : Tue Sep 15 20:40:18 2015
* --------------------------------------------------------
*
*/
......
......@@ -36,8 +36,7 @@ set(CMAKE_AUX_BIN ${PROJECT_BINARY_DIR}/cmake_aux)
add_subdirectory (${CMAKE_AUX}/libraries/ ${CMAKE_AUX_BIN}/libraries/)
# Libxml2
xml_lib()
set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE)
xml_lib(gen_user)
# function to list all source files in the src/ directory,
# recursing into sub-directories
......
......@@ -211,10 +211,13 @@ int main(int argc, char *argv[])
char* mbsFile;
if (argc==1){
mbsFile = "/home/ndocquier/Documents/MBsysC/MBprojects/PendulumSpringC/dataR/PendulumSpringC.mbs";
if (argc==1)
{
printf("Error: function called without argument! The first argument must be the .mbs file (with its path).\n");
exit(EXIT_FAILURE);
}
else{
else
{
mbsFile = argv[1];
}
//find_user_path(argv[1]);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment