/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2420 by jpye, Tue Mar 15 12:32:20 2011 UTC revision 2421 by jpye, Thu Mar 17 22:58:16 2011 UTC
# Line 290  vars.Add(ListVariable( Line 290  vars.Add(ListVariable(
290      ,"List of the solvers you want to build. The default is the minimum that"        ,"List of the solvers you want to build. The default is the minimum that"  
291          +" works. The option 'LSOD' is provided for backwards compatibility"          +" works. The option 'LSOD' is provided for backwards compatibility"
292          +"; the value 'LSODE' is preferred."          +"; the value 'LSODE' is preferred."
293      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON","IPOPT","DOPRI5"]      ,["QRSLV","CMSLV","LSODE","IDA","CONOPT","LRSLV","TRON","IPOPT","DOPRI5","RADAU5"]
294      ,['QRSLV','MPS','SLV','OPTSQP'      ,['QRSLV','MPS','SLV','OPTSQP'
295          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'          ,'NGSLV','CMSLV','LRSLV','MINOS','CONOPT'
296          ,'LSODE','LSOD','OPTSQP',"IDA","TRON","IPOPT","DOPRI5","MAKEMPS"          ,'LSODE','LSOD','OPTSQP',"IDA","TRON","IPOPT","DOPRI5","MAKEMPS","RADAU5"
297       ]       ]
298  ))  ))
299    
# Line 1017  without_ida_reason = notselected Line 1017  without_ida_reason = notselected
1017  with_dopri5 = 'DOPRI5' in env['WITH_SOLVERS']  with_dopri5 = 'DOPRI5' in env['WITH_SOLVERS']
1018  without_dopri5_reason = notselected  without_dopri5_reason = notselected
1019    
1020    with_radau5 = 'RADAU5' in env['WITH_SOLVERS']
1021    without_radau5_reason = notselected
1022    
1023  with_conopt = 'CONOPT' in env['WITH_SOLVERS']  with_conopt = 'CONOPT' in env['WITH_SOLVERS']
1024  without_conopt_reason = notselected  without_conopt_reason = notselected
1025    
# Line 2698  if env['GCOV']: Line 2701  if env['GCOV']:
2701          , LINKFLAGS=['-fprofile-arcs','-ftest-coverage']          , LINKFLAGS=['-fprofile-arcs','-ftest-coverage']
2702      )      )
2703    
2704    #FIXME there must be a better way of doing this...
2705    
2706  if with_ida:  if with_ida:
2707      env.Append(WITH_IDA=1)      env.Append(WITH_IDA=1)
2708    
# Line 2710  if with_ipopt: Line 2715  if with_ipopt:
2715  if with_dopri5:  if with_dopri5:
2716      env.Append(WITH_DOPRI5=1)      env.Append(WITH_DOPRI5=1)
2717    
2718    if with_radau5:
2719        env.Append(WITH_RADAU5=1)
2720    
2721  if with_makemps:  if with_makemps:
2722      env.Append(WITH_MAKEMPS=1)      env.Append(WITH_MAKEMPS=1)
2723    

Legend:
Removed from v.2420  
changed lines
  Added in v.2421

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22