Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1402 → Rev 1401

/demos/trunk/rtw/rtw.c
47,20 → 47,10
real_T rtMinusInf;
real_T rtNaN;
 
#if NCSTATES > 0
extern void rt_ODECreateIntegrationData(RTWSolverInfo *si);
extern void rt_ODEUpdateContinuousStates(RTWSolverInfo *si);
# define rt_CreateIntegrationData(S) \
rt_ODECreateIntegrationData(rtmGetRTWSolverInfo(S));
# define rt_UpdateContinuousStates(S) \
rt_ODEUpdateContinuousStates(rtmGetRTWSolverInfo(S));
# else
# define rt_CreateIntegrationData(S) \
rtsiSetSolverName(rtmGetRTWSolverInfo(S),"FixedStepDiscrete");
# define rt_UpdateContinuousStates(S) \
rtmSetT(S, rtsiGetSolverStopTime(rtmGetRTWSolverInfo(S)));
#endif
 
/*==================================*
* Global data local to this module *
/demos/trunk/rtw/makefile
11,11 → 11,8
MATLAB_RTW_DEMO_DIR = /usr/local/home/giacomo/shark_mat/Subsystem_grt_rtw/
 
DEFINE_MODEL = Subsystem
DEFINE_NUMST = 2
DEFINE_NCSTATES = 1
DEFINE_TID01EQ = 1
DEFINE_NUMST = 1
DEFINE_RTWLIB += -lrtw
DEFINE_SOLVER = ode4.o
 
FILE_CODE = $(DEFINE_MODEL).o
FILE_DATA = $(DEFINE_MODEL)_data.o
22,9 → 19,9
 
PROGS = rtw
 
RTW_CFG = "-I$(MATLAB_ROOT)/simulink/include -I$(MATLAB_ROOT)/extern/include -I$(MATLAB_ROOT)/rtw/c/src -I$(MATLAB_ROOT)/rtw/c/libsrc -I$(MATLAB_RTW_DEMO_DIR) -DUSE_RTMODEL -DRT -DMODEL=$(DEFINE_MODEL) -DNUMST=$(DEFINE_NUMST) -DNCSTATES=$(DEFINE_NCSTATES) -DTID01EQ=$(DEFINE_TID01EQ)"
RTW_CFG = "-I$(MATLAB_ROOT)/simulink/include -I$(MATLAB_ROOT)/extern/include -I$(MATLAB_ROOT)/rtw/c/src -I$(MATLAB_ROOT)/rtw/c/libsrc -I$(MATLAB_RTW_DEMO_DIR) -DUSE_RTMODEL -DRT -DMODEL=$(DEFINE_MODEL) -DNUMST=$(DEFINE_NUMST)"
 
RTW_OBJS = $(MATLAB_RTW_DEMO_DIR)/$(FILE_CODE) $(MATLAB_ROOT)/rtw/c/src/$(DEFINE_SOLVER) $(MODULES_rtwlib)
RTW_OBJS = $(MATLAB_RTW_DEMO_DIR)/$(FILE_CODE) $(MODULES_rtwlib)
 
ifeq ($(FILE_DATA),$(DEFINE_MODEL)_data.o)
RTW_OBJS += $(MATLAB_RTW_DEMO_DIR)/$(FILE_DATA)