Changeset 180 for stable/2.1


Ignore:
Timestamp:
Nov 9, 2010 9:49:53 AM (9 years ago)
Author:
kulshres
Message:

Merge stable version with rev 179

Location:
stable/2.1
Files:
1 added
129 edited

Legend:

Unmodified
Added
Removed
  • stable/2.1/ADOL-C/Makefile.am

    r91 r180  
    2727endif
    2828
     29BUILT_SOURCES = $(top_builddir)/ADOL-C/adolc/adolc.h
     30
     31$(top_builddir)/ADOL-C/adolc/adolc.h:
     32        $(LN_S) $(top_srcdir)/ADOL-C/src adolc
     33
    2934MAINTAINERCLEANFILES = Makefile.in
    3035
  • stable/2.1/ADOL-C/Makefile.in

    r130 r180  
    236236@ADDEXA_TRUE@@DOCEXA_FALSE@SUBDIRS = src examples test
    237237@DOCEXA_TRUE@SUBDIRS = src examples test
     238BUILT_SOURCES = $(top_builddir)/ADOL-C/adolc/adolc.h
    238239MAINTAINERCLEANFILES = Makefile.in
    239 all: all-recursive
     240all: $(BUILT_SOURCES)
     241        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    240242
    241243.SUFFIXES:
     
    471473        done
    472474check-am: all-am
    473 check: check-recursive
     475check: $(BUILT_SOURCES)
     476        $(MAKE) $(AM_MAKEFLAGS) check-recursive
    474477all-am: Makefile
    475478installdirs: installdirs-recursive
    476479installdirs-am:
    477 install: install-recursive
     480install: $(BUILT_SOURCES)
     481        $(MAKE) $(AM_MAKEFLAGS) install-recursive
    478482install-exec: install-exec-recursive
    479483install-data: install-data-recursive
     
    500504        @echo "This command is intended for maintainers to use"
    501505        @echo "it deletes files that may require special tools to rebuild."
     506        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
    502507        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
    503508clean: clean-recursive
     
    567572uninstall-am:
    568573
    569 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
    570         install-am install-strip tags-recursive
     574.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
     575        ctags-recursive install install-am install-strip \
     576        tags-recursive
    571577
    572578.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
     
    585591
    586592
     593$(top_builddir)/ADOL-C/adolc/adolc.h:
     594        $(LN_S) $(top_srcdir)/ADOL-C/src adolc
     595
    587596test: all
    588597        cd test; $(MAKE) test
  • stable/2.1/ADOL-C/doc/adolc-manual.tex

    r130 r180  
    725725and may be adjusted by the user in the header file before compiling
    726726the ADOL-C library, or on runtime using a file named \verb=.adolcrc=.
     727The filesystem folder, where the tapes files may be written to disk,
     728can be changed by changing the definition of {\sf TAPE\_DIR} in
     729the header file \verb=<adolc/dvlparms.h>= before
     730compiling the ADOL-C library, or on runtime by defining {\sf
     731  TAPE\_DIR} in the \verb=.adolcrc= file. By default this is defined
     732to be the present working directory (\verb=.=).
    727733
    728734For simple usage, {\sf trace\_on} may be called with only the tape
  • stable/2.1/ADOL-C/doc/version.tex

    r162 r180  
    11\newcommand{\packagename}{adolc}
    2 \newcommand{\packageversion}{2.1.10-stable}
     2\newcommand{\packageversion}{2.1.11-stable}
    33\newcommand{\packagetar}{\packagename-\packageversion}
  • stable/2.1/ADOL-C/examples/Makefile.am

    r162 r180  
    1313AM_CFLAGS               = @ac_adolc_cflags@
    1414AM_CXXFLAGS             = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
     17INCLUDES                = -I$(top_builddir)/ADOL-C
     18
    1819LDADD                   = -ladolc
    19 AM_LDFLAGS              = -L../src
    20 AM_CPPFLAGS             += @COLPACK_CFLAGS@
    21 else
    22 LDADD                   = -ladolc
    23 AM_LDFLAGS              = -L../src
    24 endif
    25 
    26 INCLUDES                = -I$(top_builddir)
     20AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    2721
    2822MAINTAINERCLEANFILES    = Makefile.in *~ *.orig ADOLC-*.tap
  • stable/2.1/ADOL-C/examples/Makefile.in

    r162 r180  
    3838build_triplet = @build@
    3939host_triplet = @host@
    40 @SPARSE_TRUE@am__append_1 = @COLPACK_CFLAGS@
    4140@DOCEXA_TRUE@noinst_PROGRAMS = detexam$(EXEEXT) speelpenning$(EXEEXT) \
    4241@DOCEXA_TRUE@   powexam$(EXEEXT) odexam$(EXEEXT) \
     
    277276AM_CFLAGS = @ac_adolc_cflags@
    278277AM_CXXFLAGS = @ac_adolc_cxxflags@
    279 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src $(am__append_1)
    280 @SPARSE_FALSE@LDADD = -ladolc
    281 @SPARSE_TRUE@LDADD = -ladolc
    282 @SPARSE_FALSE@AM_LDFLAGS = -L../src
    283 @SPARSE_TRUE@AM_LDFLAGS = -L../src
    284 INCLUDES = -I$(top_builddir)
     278AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     279INCLUDES = -I$(top_builddir)/ADOL-C
     280LDADD = -ladolc
     281AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
    285282MAINTAINERCLEANFILES = Makefile.in *~ *.orig ADOLC-*.tap
    286283EXTRA_DIST = adolc_examples.sln \
  • stable/2.1/ADOL-C/examples/additional_examples/checkpointing/Makefile.am

    r162 r180  
    1313AM_CFLAGS             = @ac_adolc_cflags@
    1414AM_CXXFLAGS           = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                 = -ladolc
    19 AM_LDFLAGS            = -L../../../src
    20 else
    21 LDADD                 = -ladolc
    22 AM_LDFLAGS            = -L../../../src
    23 endif
     18AM_LDFLAGS            = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES              = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES              = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES  = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/checkpointing/Makefile.in

    r162 r180  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219checkpointing_SOURCES = checkpointing.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/checkpointing/checkpointing.cpp

    r42 r180  
    1313---------------------------------------------------------------------------*/
    1414#include <math.h>
    15 #include <adolc.h>
     15#include <adolc/adolc.h>
    1616
    1717#define h 0.01
  • stable/2.1/ADOL-C/examples/additional_examples/clock/myclock.cpp

    r42 r180  
    1818#include <sys/timeb.h>
    1919#include <time.h>
    20 #include <../examples/additional_examples/clock/myclock.h>
     20#include "myclock.h"
    2121
    2222
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/Makefile.in

    r162 r180  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223detexam_SOURCES = detexam.cpp ../clock/myclock.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/detexam-old.cpp

    r91 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
    19 #include <../examples/additional_examples/clock/myclock.h>
     18#include <adolc/adolc.h>
     19#include "../clock/myclock.h"
    2020
    2121
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/detexam.cpp

    r91 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
    19 #include <../examples/additional_examples/clock/myclock.h>
     18#include <adolc/adolc.h>
     19#include "../clock/myclock.h"
    2020
    2121
  • stable/2.1/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.am

    r162 r180  
    1313AM_CFLAGS              = @ac_adolc_cflags@
    1414AM_CXXFLAGS            = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                  = -ladolc
    19 AM_LDFLAGS             = -L../../../src
    20 else
    21 LDADD                  = -ladolc
    22 AM_LDFLAGS             = -L../../../src
    23 endif
     18AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES               = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES               = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.in

    r162 r180  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219ext_diff_func_SOURCES = ext_diff_func.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/ext_diff_func/ext_diff_func.cpp

    r42 r180  
    1313---------------------------------------------------------------------------*/
    1414#include <math.h>
    15 #include <adolc.h>
     15#include <adolc/adolc.h>
    1616
    1717#define h 0.01
  • stable/2.1/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.am

    r162 r180  
    1313AM_CFLAGS              = @ac_adolc_cflags@
    1414AM_CXXFLAGS            = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS            = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                  = -ladolc
    19 AM_LDFLAGS             = -L../../../src
    20 else
    21 LDADD                  = -ladolc
    22 AM_LDFLAGS             = -L../../../src
    23 endif
     18AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES               = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES               = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.in

    r162 r180  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219fixpoint_exam_SOURCES = fixpoint_exam.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/fixpoint_exam/fixpoint_exam.cpp

    r42 r180  
    1313---------------------------------------------------------------------------*/
    1414#include <math.h>
    15 #include <adolc.h>
     15#include <adolc/adolc.h>
    1616
    1717#define imax 100
  • stable/2.1/ADOL-C/examples/additional_examples/helm/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/helm/Makefile.in

    r162 r180  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir)
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223helm_auto_SOURCES = helm-auto-exam.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/helm/helm-auto-exam.cpp

    r91 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/hessmat/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/hessmat/Makefile.in

    r162 r180  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir)
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219hessmat_SOURCES = hessmat.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/hessmat/hessmat.cpp

    r42 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <stdlib.h>
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/Makefile.in

    r162 r180  
    227227AM_CFLAGS = @ac_adolc_cflags@
    228228AM_CXXFLAGS = @ac_adolc_cxxflags@
    229 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    230 @SPARSE_FALSE@LDADD = -ladolc
    231 @SPARSE_TRUE@LDADD = -ladolc
    232 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    233 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    234 INCLUDES = -I$(top_builddir)
     229AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     230LDADD = -ladolc
     231AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     232INCLUDES = -I$(top_builddir)/ADOL-C
    235233MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    236234cubic_SOURCES = cubic.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/cubic-2.cpp

    r42 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/cubic-iter-2.cpp

    r42 r180  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>
     20#include <adolc/adolc.h>
    2121#include <math.h>
    2222
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/cubic-iter.cpp

    r42 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/cubic.cpp

    r42 r180  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>
     20#include <adolc/adolc.h>
    2121
    2222#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/LU.cpp

    r42 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <../examples/additional_examples/lufact/LU.h>
     19#include "LU.h"
    2020
    2121/****************************************************************************/
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/LU.h

    r42 r180  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>           // use of ALL ADOL-C interfaces
     20#include <adolc/adolc.h>           // use of ALL ADOL-C interfaces
    2121
    2222
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/LUdet.cpp

    r91 r180  
    2323/****************************************************************************/
    2424/*                                                                 INCLUDES */
    25 #include <../examples/additional_examples/lufact/LU.h>
     25#include "LU.h"
    2626
    2727
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/LUsolve.cpp

    r91 r180  
    2323/****************************************************************************/
    2424/*                                                                 INCLUDES */
    25 #include <../examples/additional_examples/lufact/LU.h>
     25#include "LU.h"
    2626
    2727/****************************************************************************/
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/Makefile.am

    r162 r180  
    1414AM_CFLAGS            = @ac_adolc_cflags@
    1515AM_CXXFLAGS          = @ac_adolc_cxxflags@
    16 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     16AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1717
    18 if SPARSE
    1918LDADD                = -ladolc
    20 AM_LDFLAGS           = -L../../../src
    21 else
    22 LDADD                = -ladolc
    23 AM_LDFLAGS           = -L../../../src
    24 endif
     19AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2520
    26 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     21INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2722
    2823EXTRA_DIST           = LU.h
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/Makefile.in

    r162 r180  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    224222EXTRA_DIST = LU.h
    225223MAINTAINERCLEANFILES = Makefile.in tape.tex *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/ode/Makefile.am

    r162 r180  
    1616AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
    1717
    18 if SPARSE
    1918LDADD                = -ladolc
    20 AM_LDFLAGS           = -L../../../src
    21 else
    22 LDADD                = -ladolc
    23 AM_LDFLAGS           = -L../../../src
    24 endif
     19AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2520
    26 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     21INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2722
    2823MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/ode/Makefile.in

    r162 r180  
    225225AM_CXXFLAGS = @ac_adolc_cxxflags@
    226226AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    227 @SPARSE_FALSE@LDADD = -ladolc
    228 @SPARSE_TRUE@LDADD = -ladolc
    229 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    230 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    231 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     227LDADD = -ladolc
     228AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     229INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    232230MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    233231odexam_SOURCES = vfunc_robertson.cpp vgenodemain.cpp ../clock/myclock.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/ode/vfunc_eutroph.cpp

    r42 r180  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/ode/vfunc_fic.cpp

    r42 r180  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/ode/vfunc_robertson.cpp

    r42 r180  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/ode/vgenodemain.cpp

    r91 r180  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
    32 #include <../examples/additional_examples/clock/myclock.h>
     31#include <adolc/adolc.h>
     32#include "../clock/myclock.h"
    3333
    3434#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/openmp_exam/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/openmp_exam/Makefile.in

    r162 r180  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir)
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223liborser_SOURCES = liborser.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/pow/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/pow/Makefile.in

    r162 r180  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir)
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219powexam_SOURCES = powexam.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/pow/powexam.cpp

    r42 r180  
    1717/*                                                                 INCLUDES */
    1818
    19 #include <adolc.h>               // use of ALL ADOL-C interfaces
     19#include <adolc/adolc.h>               // use of ALL ADOL-C interfaces
    2020
    2121#include <iostream>
  • stable/2.1/ADOL-C/examples/additional_examples/scal/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/scal/Makefile.in

    r162 r180  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir)
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219scalexam_SOURCES = scalexam.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/scal/scalexam.cpp

    r91 r180  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <math.h>
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/Makefile.am

    r162 r180  
    1313AM_CFLAGS               = @ac_adolc_cflags@
    1414AM_CXXFLAGS             = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                   = -ladolc
    19 AM_LDFLAGS              = -L../../../src
    20 else
    21 LDADD                   = -ladolc
    22 AM_LDFLAGS              = -L../../../src
    23 endif
     18AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES                = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES                = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES    = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/Makefile.in

    r162 r180  
    229229AM_CFLAGS = @ac_adolc_cflags@
    230230AM_CXXFLAGS = @ac_adolc_cxxflags@
    231 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    232 @SPARSE_FALSE@LDADD = -ladolc
    233 @SPARSE_TRUE@LDADD = -ladolc
    234 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    235 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    236 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     231AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     232LDADD = -ladolc
     233AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     234INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    237235MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    238236@SPARSE_TRUE@sparse_jacobian_SOURCES = sparse_jacobian.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/jacpatexam.cpp

    r42 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
    19 #include <adolc_sparse.h>
    20 #include <../examples/additional_examples/clock/myclock.h>
     18#include <adolc/adolc.h>
     19#include <adolc/adolc_sparse.h>
     20#include "../clock/myclock.h"
    2121
    2222#include <string.h>
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/sparse_hessian.cpp

    r162 r180  
    1818#include <cstdio>
    1919
    20 #include <adolc.h>
    21 #include <adolc_sparse.h>
     20#include <adolc/adolc.h>
     21#include <adolc/adolc_sparse.h>
    2222
    2323#define tag 1
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/sparse_jacobian.cpp

    r162 r180  
    1818#include <cstdio>
    1919
    20 #include <adolc.h>
    21 #include <adolc_sparse.h>
     20#include <adolc/adolc.h>
     21#include <adolc/adolc_sparse.h>
    2222
    2323#define tag 1
  • stable/2.1/ADOL-C/examples/additional_examples/speelpenning/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     20INCLUDES             = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/speelpenning/Makefile.in

    r162 r180  
    212212AM_CFLAGS = @ac_adolc_cflags@
    213213AM_CXXFLAGS = @ac_adolc_cxxflags@
    214 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215 @SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc
    217 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    219 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     215LDADD = -ladolc
     216AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     217INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)/ADOL-C/examples/additional_examples
    220218MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    221219speelpenning_SOURCES = speelpenning.cpp ../clock/myclock.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/speelpenning/speelpenning.cpp

    r91 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
    20 #include <../examples/additional_examples/clock/myclock.h>
     19#include <adolc/adolc.h>
     20#include "../clock/myclock.h"
    2121
    2222
  • stable/2.1/ADOL-C/examples/additional_examples/tapesave/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/tapesave/Makefile.in

    r162 r180  
    216216AM_CFLAGS = @ac_adolc_cflags@
    217217AM_CXXFLAGS = @ac_adolc_cxxflags@
    218 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219 @SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc
    221 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    223 INCLUDES = -I$(top_builddir)
     218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     219LDADD = -ladolc
     220AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     221INCLUDES = -I$(top_builddir)/ADOL-C
    224222MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    225223createTape_SOURCES = createTape.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/tapesave/createTape.cpp

    r42 r180  
    2323/*                                                                 INCLUDES */
    2424/* use of ALL ADOL-C interfaces */
    25 #include <adolc.h>
     25#include <adolc/adolc.h>
    2626
    2727/****************************************************************************/
  • stable/2.1/ADOL-C/examples/additional_examples/tapesave/useTape.cpp

    r91 r180  
    2323/*                                                                 INCLUDES */
    2424/* use of ALL ADOL-C interfaces */
    25 #include <adolc.h>
     25#include <adolc/adolc.h>
    2626
    2727#include <cstdio>
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/Makefile.am

    r162 r180  
    1313AM_CFLAGS            = @ac_adolc_cflags@
    1414AM_CXXFLAGS          = @ac_adolc_cxxflags@
    15 AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/src
     15AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    1616
    17 if SPARSE
    1817LDADD                = -ladolc
    19 AM_LDFLAGS           = -L../../../src
    20 else
    21 LDADD                = -ladolc
    22 AM_LDFLAGS           = -L../../../src
    23 endif
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
    2419
    25 INCLUDES             = -I$(top_builddir)
     20INCLUDES             = -I$(top_builddir)/ADOL-C
    2621
    2722MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/Makefile.in

    r162 r180  
    232232AM_CFLAGS = @ac_adolc_cflags@
    233233AM_CXXFLAGS = @ac_adolc_cxxflags@
    234 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    235 @SPARSE_FALSE@LDADD = -ladolc
    236 @SPARSE_TRUE@LDADD = -ladolc
    237 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    238 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    239 INCLUDES = -I$(top_builddir)
     234AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     235LDADD = -ladolc
     236AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     237INCLUDES = -I$(top_builddir)/ADOL-C
    240238MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    241239taylorexam_SOURCES = taylorexam.cpp
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/accessexam.cpp

    r42 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
     18#include <adolc/adolc.h>
    1919
    2020#include <stdlib.h>
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/coordinates.cpp

    r42 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
     18#include <adolc/adolc.h>
    1919
    2020#include <cstdlib>
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/inversexam.cpp

    r42 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adolc.h>
     19#include <adolc/adolc.h>
    2020
    2121#include <cstdlib>
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/taylorexam.cpp

    r42 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>
     18#include <adolc/adolc.h>
    1919
    2020#include <cstdlib>
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/trigger.cpp

    r42 r180  
    1818/****************************************************************************/
    1919/*                                                                 INCLUDES */
    20 #include <adolc.h>
     20#include <adolc/adolc.h>
    2121
    2222#include <cstdlib>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/Makefile.am

    r162 r180  
    1414AM_CFLAGS               = @ac_adolc_cflags@
    1515AM_CXXFLAGS             = @ac_adolc_cxxflags@
    16 AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C/src
     16AM_CPPFLAGS             = -I$(top_srcdir)/ADOL-C
    1717
    18 if SPARSE
    1918LDADD                   = -ladolc
    20 AM_LDFLAGS              = -L../../../src
    21 else
    22 LDADD                   = -ladolc
    23 AM_LDFLAGS              = -L../../../src
    24 endif
     19AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
    2520
    26 INCLUDES                = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     21INCLUDES                = -I$(top_builddir)/ADOL-C -I$(top_srcdir)ADOL-C/examples/additional_examples
    2722
    2823CTRLFILES               = detexam.ctrl \
  • stable/2.1/ADOL-C/examples/additional_examples/timing/Makefile.in

    r162 r180  
    302302AM_CFLAGS = @ac_adolc_cflags@
    303303AM_CXXFLAGS = @ac_adolc_cxxflags@
    304 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    305 @SPARSE_FALSE@LDADD = -ladolc
    306 @SPARSE_TRUE@LDADD = -ladolc
    307 @SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    308 @SPARSE_TRUE@AM_LDFLAGS = -L../../../src
    309 INCLUDES = -I$(top_builddir) -I$(top_builddir)/examples/additional_examples
     304AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     305LDADD = -ladolc
     306AM_LDFLAGS = -L$(top_builddir)/ADOL-C/src
     307INCLUDES = -I$(top_builddir)/ADOL-C -I$(top_srcdir)ADOL-C/examples/additional_examples
    310308CTRLFILES = detexam.ctrl \
    311309                          eutrophexam.ctrl \
  • stable/2.1/ADOL-C/examples/additional_examples/timing/rotations.cpp

    r42 r180  
    2020/****************************************************************************/
    2121/*                                                                 INCLUDES */
    22 #include <adolc.h>
    23 #include <../examples/additional_examples/timing/rotations.h>
     22#include <adolc/adolc.h>
     23#include "rotations.h"
    2424
    2525#include <cmath>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_determinant.cpp

    r42 r180  
    2626/****************************************************************************/
    2727/*                                                                 INCLUDES */
    28 #include <adolc.h>
     28#include <adolc/adolc.h>
    2929
    3030
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_experimental.cpp

    r42 r180  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <time.h>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_griewank.cpp

    r42 r180  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <cmath>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_helmholtz.cpp

    r42 r180  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030#include <cmath>
    3131
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_michalewitz.cpp

    r42 r180  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <cmath>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_power.cpp

    r42 r180  
    2626/****************************************************************************/
    2727/*                                                                 INCLUDES */
    28 #include <adolc.h>
     28#include <adolc/adolc.h>
    2929
    3030#include <cstdlib>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_rosenbrock.cpp

    r42 r180  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <cmath>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sfunc_speelpenning.cpp

    r42 r180  
    2727/****************************************************************************/
    2828/*                                                                 INCLUDES */
    29 #include <adolc.h>
     29#include <adolc/adolc.h>
    3030
    3131#include <time.h>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sgenmain.cpp

    r91 r180  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
    32 #include <../examples/additional_examples/clock/myclock.h>
     31#include <adolc/adolc.h>
     32#include "../clock/myclock.h"
    3333
    3434#include <cstdlib>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/vfunc_gear.cpp

    r42 r180  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <cmath>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/vfunc_pargear.cpp

    r42 r180  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
    32 #include <../examples/additional_examples/timing/rotations.h>
     31#include <adolc/adolc.h>
     32#include "rotations.h"
    3333
    3434#include <cmath>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/vfunc_shuttle.cpp

    r42 r180  
    2929/****************************************************************************/
    3030/*                                                                 INCLUDES */
    31 #include <adolc.h>
     31#include <adolc/adolc.h>
    3232
    3333#include <cmath>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/vfunc_simplevec.cpp

    r42 r180  
    2828/****************************************************************************/
    2929/*                                                                 INCLUDES */
    30 #include <adolc.h>
     30#include <adolc/adolc.h>
    3131
    3232#include <time.h>
  • stable/2.1/ADOL-C/examples/additional_examples/timing/vgenmain.cpp

    r91 r180  
    3131/****************************************************************************/
    3232/*                                                                 INCLUDES */
    33 #include <adolc.h>
    34 #include <../examples/additional_examples/clock/myclock.h>
     33#include <adolc/adolc.h>
     34#include "../clock/myclock.h"
    3535
    3636#include <cstdlib>
  • stable/2.1/ADOL-C/examples/detexam.cpp

    r42 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adouble.h>          // use of active doubles
    19 #include <interfaces.h>       // use of basic forward/reverse
     18#include <adolc/adouble.h>          // use of active doubles
     19#include <adolc/interfaces.h>       // use of basic forward/reverse
    2020// interfaces of ADOL-C
    21 #include <taping.h>           // use of taping
     21#include <adolc/taping.h>           // use of taping
    2222
    2323#include <iostream>
  • stable/2.1/ADOL-C/examples/detexam.vcxproj

    r170 r180  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8585    <ClCompile>
    8686      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    87       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     87      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8888      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8989      <WarningLevel>Level3</WarningLevel>
     
    9999    <ClCompile>
    100100      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     101      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102102      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    103103      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
     
    130130    <ProjectReference Include="..\..\windows\adolc.vcxproj">
    131131      <Project>{afafebb2-f23f-6598-0e88-8fde80540c04}</Project>
    132       <Private>false</Private>
     132      <Private>true</Private>
    133133      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    134       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     134      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
    135135      <LinkLibraryDependencies>true</LinkLibraryDependencies>
    136136      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
  • stable/2.1/ADOL-C/examples/odexam.cpp

    r42 r180  
    1717/****************************************************************************/
    1818/*                                                                 INCLUDES */
    19 #include <adouble.h>            // use of active double
    20 #include <drivers/odedrivers.h> // use of "Easy To Use" ODE drivers
    21 #include <adalloc.h>            // use of ADOL-C allocation utilities
    22 #include <taping.h>             // use of taping
     19#include <adolc/adouble.h>            // use of active double
     20#include <adolc/drivers/odedrivers.h> // use of "Easy To Use" ODE drivers
     21#include <adolc/adalloc.h>            // use of ADOL-C allocation utilities
     22#include <adolc/taping.h>             // use of taping
    2323
    2424// NOTICE: If one wants to include all ADOL-C interfaces without
    2525//         getting in trouble to find out the right header files
    2626//
    27 //         #include "adolc.h"
     27//         #include "adolc/adolc.h"
    2828//
    2929//         will do the right work.
  • stable/2.1/ADOL-C/examples/odexam.vcxproj

    r170 r180  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8585    <ClCompile>
    8686      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    87       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     87      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8888      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8989      <WarningLevel>Level3</WarningLevel>
     
    9999    <ClCompile>
    100100      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     101      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102102      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    103103      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
     
    143143    <ProjectReference Include="..\..\windows\adolc.vcxproj">
    144144      <Project>{afafebb2-f23f-6598-0e88-8fde80540c04}</Project>
    145       <Private>false</Private>
     145      <Private>true</Private>
    146146      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    147       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     147      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
    148148      <LinkLibraryDependencies>true</LinkLibraryDependencies>
    149149      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
  • stable/2.1/ADOL-C/examples/powexam.cpp

    r42 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adolc.h>             /* use of ALL ADOL-C interfaces */
     18#include <adolc/adolc.h>             /* use of ALL ADOL-C interfaces */
    1919
    2020#include <iostream>
  • stable/2.1/ADOL-C/examples/powexam.vcxproj

    r170 r180  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8585    <ClCompile>
    8686      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    87       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     87      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8888      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8989      <WarningLevel>Level3</WarningLevel>
     
    9999    <ClCompile>
    100100      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     101      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102102      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    103103      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
     
    133133    <ProjectReference Include="..\..\windows\adolc.vcxproj">
    134134      <Project>{afafebb2-f23f-6598-0e88-8fde80540c04}</Project>
    135       <Private>false</Private>
     135      <Private>true</Private>
    136136      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    137       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     137      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
    138138      <LinkLibraryDependencies>true</LinkLibraryDependencies>
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
  • stable/2.1/ADOL-C/examples/speelpenning.cpp

    r116 r180  
    1616/****************************************************************************/
    1717/*                                                                 INCLUDES */
    18 #include <adouble.h>            // use of active doubles
    19 #include <drivers/drivers.h>    // use of "Easy to Use" drivers
     18#include <adolc/adouble.h>            // use of active doubles
     19#include <adolc/drivers/drivers.h>    // use of "Easy to Use" drivers
    2020// gradient(.) and hessian(.)
    21 #include <taping.h>             // use of taping
     21#include <adolc/taping.h>             // use of taping
    2222
    2323#include <iostream>
  • stable/2.1/ADOL-C/examples/speelpenning.vcxproj

    r170 r180  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8585    <ClCompile>
    8686      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    87       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     87      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8888      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8989      <WarningLevel>Level3</WarningLevel>
     
    9999    <ClCompile>
    100100      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     101      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102102      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    103103      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
     
    133133    <ProjectReference Include="..\..\windows\adolc.vcxproj">
    134134      <Project>{afafebb2-f23f-6598-0e88-8fde80540c04}</Project>
    135       <Private>false</Private>
     135      <Private>true</Private>
    136136      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    137       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     137      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
    138138      <LinkLibraryDependencies>true</LinkLibraryDependencies>
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
  • stable/2.1/ADOL-C/examples/tapeless_scalar.cpp

    r42 r180  
    2323
    2424#define ADOLC_TAPELESS
    25 #include <adouble.h>
     25#include <adolc/adouble.h>
    2626typedef adtl::adouble adouble;
    2727
  • stable/2.1/ADOL-C/examples/tapeless_scalar.vcxproj

    r170 r180  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8585    <ClCompile>
    8686      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    87       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     87      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8888      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8989      <WarningLevel>Level3</WarningLevel>
     
    9999    <ClCompile>
    100100      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     101      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102102      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    103103      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
     
    133133    <ProjectReference Include="..\..\windows\adolc.vcxproj">
    134134      <Project>{afafebb2-f23f-6598-0e88-8fde80540c04}</Project>
    135       <Private>false</Private>
     135      <Private>true</Private>
    136136      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    137       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     137      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
    138138      <LinkLibraryDependencies>true</LinkLibraryDependencies>
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
  • stable/2.1/ADOL-C/examples/tapeless_vector.cpp

    r42 r180  
    2323#define ADOLC_TAPELESS
    2424#define NUMBER_DIRECTIONS 3
    25 #include <adouble.h>
     25#include <adolc/adouble.h>
    2626typedef adtl::adouble adouble;
    2727
  • stable/2.1/ADOL-C/examples/tapeless_vector.vcxproj

    r170 r180  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    8585    <ClCompile>
    8686      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    87       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     87      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8888      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8989      <WarningLevel>Level3</WarningLevel>
     
    9999    <ClCompile>
    100100      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     101      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    102102      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    103103      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
     
    133133    <ProjectReference Include="..\..\windows\adolc.vcxproj">
    134134      <Project>{afafebb2-f23f-6598-0e88-8fde80540c04}</Project>
    135       <Private>false</Private>
     135      <Private>true</Private>
    136136      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    137       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     137      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
    138138      <LinkLibraryDependencies>true</LinkLibraryDependencies>
    139139      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
  • stable/2.1/ADOL-C/src/Makefile.am

    r165 r180  
    1919endif
    2020
    21 AM_CPPFLAGS          = -I$(top_srcdir)
     21AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C
    2222
    23 INCLUDES             = -I$(top_builddir)
     23INCLUDES             = -I$(top_builddir)/ADOL-C
    2424
    2525if SPARSE
     
    4646libadolc_la_LDFLAGS  = -version-info 2:1:1 -no-undefined
    4747
    48 BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
    49 
    50 $(top_builddir)/ADOL-C/src/adolc/adolc.h:
    51         $(LN_S) $(top_srcdir)/ADOL-C/src adolc
    52 
    5348if SPARSE
    5449libadolc_la_SOURCES  = adalloc.c malloc.c adouble.cpp \
    5550                       convolut.c fortutils.c \
    5651                       interfaces.cpp interfacesf.c \
    57                        taping.c tape_handling.cpp \
     52                       taping_p.h taping.c tape_handling.cpp \
    5853                       zos_forward.c fos_forward.c fov_forward.c \
    5954                       hos_forward.c hov_forward.c hov_wk_forward.c \
  • stable/2.1/ADOL-C/src/Makefile.in

    r165 r180  
    8686        fov_reverse.c hos_reverse.c hos_ov_reverse.c hov_reverse.c \
    8787        forward_partx.c externfcts.cpp checkpointing.cpp fixpoint.cpp \
    88         fov_offset_forward.c revolve.c int_forward_s.c int_forward_t.c \
    89         indopro_forward_s.c indopro_forward_t.c nonl_ind_forward_s.c \
    90         nonl_ind_forward_t.c int_reverse_s.c int_reverse_t.c
     88        fov_offset_forward.c revolve.c taping_p.h int_forward_s.c \
     89        int_forward_t.c indopro_forward_s.c indopro_forward_t.c \
     90        nonl_ind_forward_s.c nonl_ind_forward_t.c int_reverse_s.c \
     91        int_reverse_t.c
    9192@SPARSE_FALSE@am_libadolc_la_OBJECTS = adalloc.lo malloc.lo adouble.lo \
    9293@SPARSE_FALSE@  convolut.lo fortutils.lo interfaces.lo \
     
    318319@SPARSE_FALSE@AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    319320@SPARSE_TRUE@AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    320 AM_CPPFLAGS = -I$(top_srcdir)
    321 INCLUDES = -I$(top_builddir)
     321AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
     322INCLUDES = -I$(top_builddir)/ADOL-C
    322323@SPARSE_FALSE@SUBDIRS = drivers tapedoc
    323324@SPARSE_TRUE@SUBDIRS = drivers sparse tapedoc
     
    337338libadolc_la_LDFLAGS = -version-info 2:1:1 -no-undefined \
    338339        $(am__append_1)
    339 BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
    340340@SPARSE_FALSE@libadolc_la_SOURCES = adalloc.c malloc.c adouble.cpp \
    341341@SPARSE_FALSE@                       convolut.c fortutils.c\
     
    353353@SPARSE_TRUE@                       convolut.c fortutils.c \
    354354@SPARSE_TRUE@                       interfaces.cpp interfacesf.c \
    355 @SPARSE_TRUE@                       taping.c tape_handling.cpp \
     355@SPARSE_TRUE@                       taping_p.h taping.c tape_handling.cpp \
    356356@SPARSE_TRUE@                       zos_forward.c fos_forward.c fov_forward.c \
    357357@SPARSE_TRUE@                       hos_forward.c hov_forward.c hov_wk_forward.c \
     
    370370@SPARSE_TRUE@                       tapedoc/libtapedoc.la
    371371
    372 all: $(BUILT_SOURCES) config.h
     372all: config.h
    373373        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    374374
     
    759759        done
    760760check-am: all-am
    761 check: $(BUILT_SOURCES)
    762         $(MAKE) $(AM_MAKEFLAGS) check-recursive
     761check: check-recursive
    763762all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
    764763installdirs: installdirs-recursive
     
    767766          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
    768767        done
    769 install: $(BUILT_SOURCES)
    770         $(MAKE) $(AM_MAKEFLAGS) install-recursive
     768install: install-recursive
    771769install-exec: install-exec-recursive
    772770install-data: install-data-recursive
     
    793791        @echo "This command is intended for maintainers to use"
    794792        @echo "it deletes files that may require special tools to rebuild."
    795         -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
    796793        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
    797794clean: clean-recursive
     
    866863uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
    867864
    868 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
    869         ctags-recursive install install-am install-strip \
    870         tags-recursive
     865.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
     866        ctags-recursive install-am install-strip tags-recursive
    871867
    872868.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
     
    888884
    889885
    890 $(top_builddir)/ADOL-C/src/adolc/adolc.h:
    891         $(LN_S) $(top_srcdir)/ADOL-C/src adolc
    892 
    893886# Tell versions [3.59,3.63) of GNU make to not export all variables.
    894887# Otherwise a system limit (for SysV at least) may be exceeded.
  • stable/2.1/ADOL-C/src/adouble.h

    r170 r180  
    469469#else
    470470
     471#include <limits>
     472
    471473namespace adtl {
    472474
     
    506508
    507509inline double makeNaN() {
    508 #if defined(non_num)
    509     double a,b;
    510     a=non_num;
    511     b=non_den;
    512     return a/b;
    513 #else
    514 #  error Error: non_num undefined!
    515 #endif
     510    return ADOLC_MATH_NSP::numeric_limits<double>::quiet_NaN();
     511}
     512
     513inline double makeInf() {
     514    return ADOLC_MATH_NSP::numeric_limits<double>::infinity();
    516515}
    517516
     
    866865    tmp.val=ADOLC_MATH_NSP::log(a.val);
    867866    FOR_I_EQ_0_LT_NUMDIR
    868       if ((a.val>0 || a.val==0) && a.ADVAL_I>=0) tmp.ADVAL_I=a.ADVAL_I/a.val;
    869     else tmp.ADVAL_I=makeNaN();
     867        if (a.val>0) tmp.ADVAL_I=a.ADVAL_I/a.val;
     868        else if (a.val==0 && a.ADVAL_I != 0.0) {
     869            int sign = (a.ADVAL_I < 0)  ? -1 : 1;
     870            tmp.ADVAL_I=sign*makeInf();
     871        } else tmp.ADVAL_I=makeNaN();
    870872    return tmp;
    871873}
     
    875877    tmp.val=ADOLC_MATH_NSP::sqrt(a.val);
    876878    FOR_I_EQ_0_LT_NUMDIR
    877       if ((a.val>0 || a.val==0) && a.ADVAL_I>=0) tmp.ADVAL_I=a.ADVAL_I/tmp.val/2;
    878     else tmp.ADVAL_I=makeNaN();
     879        if (a.val>0) tmp.ADVAL_I=a.ADVAL_I/(tmp.val*2);
     880        else if (a.val==0.0 && a.ADVAL_I != 0.0) {
     881            int sign = (a.ADVAL_I < 0) ? -1 : 1;
     882            tmp.ADVAL_I=sign * makeInf();
     883        } else tmp.ADVAL_I=makeNaN();
    879884    return tmp;
    880885}
  • stable/2.1/ADOL-C/src/drivers/Makefile.am

    r116 r180  
    1414AM_CXXFLAGS               = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    1515AM_LDFLAGS                = -no-undefined
    16 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/src
     16AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    1717
    1818MAINTAINERCLEANFILES      = Makefile.in *~ *.orig
    1919
    20 INCLUDES                  = -I$(top_builddir)
     20INCLUDES                  = -I$(top_builddir)/ADOL-C
    2121
    2222noinst_LTLIBRARIES        = libdrivers.la
  • stable/2.1/ADOL-C/src/drivers/Makefile.in

    r130 r180  
    237237AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    238238AM_LDFLAGS = -no-undefined
    239 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
     239AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    240240MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    241 INCLUDES = -I$(top_builddir)
     241INCLUDES = -I$(top_builddir)/ADOL-C
    242242noinst_LTLIBRARIES = libdrivers.la
    243243libdriversincludedir = $(pkgincludedir)/drivers
  • stable/2.1/ADOL-C/src/dvlparms.h

    r116 r180  
    2121/*--------------------------------------------------------------------------*/
    2222/* Directory where tapes are created */
    23 #define ADOLC_TAPE_DIR        "."
     23#define TAPE_DIR              "."
    2424/* File names for the tapes */
    2525#define ADOLC_TAYLORS_NAME    "ADOLC-Taylors_"
  • stable/2.1/ADOL-C/src/interfaces.h

    r116 r180  
    200200/* (defined in uni5_for.mc)                                                 */
    201201ADOLC_DLL_EXPORT int fos_forward(
    202     short,int,int,int,double*,double*,double*,double*);
     202    short,int,int,int,const double*,double*,double*,double*);
    203203
    204204/* fos_forward_nk(tag,m,n,x[n],X[n],y[m],Y[m])                              */
  • stable/2.1/ADOL-C/src/sparse/Makefile.am

    r162 r180  
    1313AM_CFLAGS                = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    1414AM_CXXFLAGS              = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    15 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
     15AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    1616
    17 INCLUDES                 = -I$(top_builddir)
     17INCLUDES                 = -I$(top_builddir)/ADOL-C
    1818
    1919MAINTAINERCLEANFILES     = Makefile.in *~ *.orig
  • stable/2.1/ADOL-C/src/sparse/Makefile.in

    r162 r180  
    235235AM_CFLAGS = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    236236AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    237 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    238 INCLUDES = -I$(top_builddir)
     237AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
     238INCLUDES = -I$(top_builddir)/ADOL-C
    239239MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    240240noinst_LTLIBRARIES = libsparse.la
  • stable/2.1/ADOL-C/src/sparse/sparsedrivers.cpp

    r162 r180  
    144144
    145145int hess_pat(
    146     short        tag,        /* tape identification                        */
    147     int          indep,      /* number of independent variables            */
    148     double       *basepoint, /* independant variable values                */
     146    short          tag,        /* tape identification                        */
     147    int            indep,      /* number of independent variables            */
     148    const double  *basepoint, /* independant variable values                */
    149149    unsigned int **crs,
    150150    /* returned compressed row block-index storage                         */
     
    389389    int            indep,      /* number of independent variables         */
    390390    int            repeat,     /* indicated repeated call with same seed  */
    391     double        *basepoint,  /* independant variable values             */
     391    const double  *basepoint,  /* independant variable values             */
    392392    int           *nnz,        /* number of nonzeros                      */
    393393    unsigned int **rind,       /* row index                               */
     
    588588
    589589/****************************************************************************/
    590 /*******        sparse Hessians, complete driver              ***************/
     590/*******      sparse Hessians, set and get sparsity pattern   ***************/
    591591/****************************************************************************/
    592592
     
    618618}
    619619#endif
     620
     621void get_HP(
     622    short          tag,        /* tape identification                     */
     623    int            indep,      /* number of independent variables         */
     624    unsigned int *** HP)
     625#ifdef SPARSE
     626{
     627    SparseHessInfos sHinfos;
     628    TapeInfos *tapeInfos;
     629
     630    tapeInfos=getTapeInfos(tag);
     631    memcpy(&ADOLC_CURRENT_TAPE_INFOS, tapeInfos, sizeof(TapeInfos));
     632    *HP = ADOLC_CURRENT_TAPE_INFOS.pTapeInfos.sHinfos.HP;
     633}
     634#else
     635{
     636    fprintf(DIAG_OUT, "ADOL-C error: function %s can only be used if sparse configuration option was used\n", __FUNCTION__);
     637    exit(-1);
     638}
     639#endif
     640
    620641/*****************************************************************************/
    621642/*                                                    JACOBIAN BLOCK PATTERN */
  • stable/2.1/ADOL-C/src/sparse/sparsedrivers.h

    r157 r180  
    6060/*                                                                          */
    6161
    62 ADOLC_DLL_EXPORT int hess_pat(short,int,double*,unsigned int**, int);
     62ADOLC_DLL_EXPORT int hess_pat(short,int,const double*,unsigned int**, int);
    6363
    6464/*--------------------------------------------------------------------------*/
     
    7575
    7676ADOLC_DLL_EXPORT int sparse_hess
    77 (short, int , int, double*, int *,
     77(short, int , int, const double*, int *,
    7878 unsigned int **, unsigned int **, double **,int*);
    7979
    80 void set_HP(
     80ADOLC_DLL_EXPORT void set_HP(
    8181    short          tag,        /* tape identification                     */
    8282    int            indep,      /* number of independent variables         */
    8383    unsigned int ** HP);
     84
     85ADOLC_DLL_EXPORT void get_HP(
     86    short          tag,        /* tape identification                     */
     87    int            indep,      /* number of independent variables         */
     88    unsigned int *** HP);
    8489
    8590/*--------------------------------------------------------------------------*/
  • stable/2.1/ADOL-C/src/tape_handling.cpp

    r157 r180  
    610610
    611611    ADOLC_OPENMP_RESTORE_THREAD_NUMBER;
     612    clearTapeBaseNames();
    612613}
    613614
  • stable/2.1/ADOL-C/src/tapedoc/Makefile.am

    r116 r180  
    1515AM_CXXFLAGS               = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    1616AM_LDFLAGS                = -no-undefined
    17 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/src
     17AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    1818
    1919MAINTAINERCLEANFILES      = Makefile.in *~ *.orig
    2020
    21 INCLUDES                  = -I$(top_builddir)
     21INCLUDES                  = -I$(top_builddir)/ADOL-C
    2222
    2323noinst_LTLIBRARIES        = libtapedoc.la
  • stable/2.1/ADOL-C/src/tapedoc/Makefile.in

    r130 r180  
    236236AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    237237AM_LDFLAGS = -no-undefined
    238 AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
     238AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C -I$(top_srcdir)/ADOL-C/src
    239239MAINTAINERCLEANFILES = Makefile.in *~ *.orig
    240 INCLUDES = -I$(top_builddir)
     240INCLUDES = -I$(top_builddir)/ADOL-C
    241241noinst_LTLIBRARIES = libtapedoc.la
    242242libtapedocincludedir = $(pkgincludedir)/tapedoc
  • stable/2.1/ADOL-C/src/taping.c

    r116 r180  
    2020#include <adolc/oplate.h>
    2121#include "taping_p.h"
     22
     23#include <sys/types.h>
     24#include <sys/stat.h>
     25
     26#if defined(_WINDOWS) && !__STDC__
     27#define stat _stat
     28#define S_IFDIR _S_IFDIR
     29#define S_IFMT _S_IFMT
     30#endif
     31
     32#ifndef S_ISDIR
     33#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
     34#endif
    2235
    2336/*--------------------------------------------------------------------------*/
     
    300313
    301314/* the base names of every tape type */
    302 const char *tapeBaseNames[] = {
    303             ADOLC_TAPE_DIR PATHSEPARATOR ADOLC_LOCATIONS_NAME,
    304             ADOLC_TAPE_DIR PATHSEPARATOR ADOLC_VALUES_NAME,
    305             ADOLC_TAPE_DIR PATHSEPARATOR ADOLC_OPERATIONS_NAME,
    306             ADOLC_TAPE_DIR PATHSEPARATOR ADOLC_TAYLORS_NAME
    307         };
     315char *tapeBaseNames[4];
     316
     317void clearTapeBaseNames() {
     318    int i;
     319    for(i=0;i<4;i++)
     320        free(tapeBaseNames[i]);
     321}
    308322
    309323/****************************************************************************/
     
    394408    char *pos1 = NULL, *pos2 = NULL, *pos3 = NULL, *pos4 = NULL, *end = NULL;
    395409    long int number = 0;
     410    char *path = NULL;
     411    int defdirsize = strlen(TAPE_DIR PATHSEPARATOR);
     412    tapeBaseNames[0] = strdup(
     413        TAPE_DIR PATHSEPARATOR ADOLC_LOCATIONS_NAME);
     414    tapeBaseNames[1] = strdup(
     415        TAPE_DIR PATHSEPARATOR ADOLC_VALUES_NAME);
     416    tapeBaseNames[2] = strdup(
     417        TAPE_DIR PATHSEPARATOR ADOLC_OPERATIONS_NAME);
     418    tapeBaseNames[3] = strdup(
     419        TAPE_DIR PATHSEPARATOR ADOLC_TAYLORS_NAME);
     420
    396421    ADOLC_OPENMP_THREAD_NUMBER;
    397422    ADOLC_OPENMP_GET_THREAD_NUMBER;
     
    431456                number = strtol(pos3 + 1, &end, 10);
    432457                if (end == (pos3 + 1)) {
    433                     fprintf(DIAG_OUT, "ADOL-C warning: Unable to parse number in "
    434                             ".adolcrc!\n");
     458                    *pos2 = 0;
     459                    *pos4 = 0;
     460                    if (strcmp(pos1 + 1, "TAPE_DIR") == 0) {
     461                        struct stat st;
     462                        int err;
     463                        path = pos3 + 1;
     464                        err = stat(path,&st);
     465                        if (err == 0 && S_ISDIR(st.st_mode)) {
     466                            int pathlen, pathseplen, namelen[4];
     467                            int i;
     468                            pathlen=strlen(path);
     469                            pathseplen=strlen(PATHSEPARATOR);
     470                            for(i = 0; i < 4; i++)
     471                                namelen[i] = strlen(tapeBaseNames[i]);
     472                            clearTapeBaseNames();
     473                            for(i = 0; i < 4; i++) {
     474                                char *currpos;
     475                                int fnamelen;
     476                                tapeBaseNames[i] = (char*)calloc(namelen[i] - defdirsize + pathlen + pathseplen + 1, sizeof(char));
     477                                currpos = tapeBaseNames[i];
     478                                strncpy(currpos,path,pathlen);
     479                                currpos += pathlen;
     480                                strncpy(currpos,PATHSEPARATOR,pathseplen);
     481                                currpos += pathseplen;
     482                                switch (i) {
     483                                case 0:
     484                                    fnamelen = strlen(ADOLC_LOCATIONS_NAME);
     485                                    strncpy(currpos,ADOLC_LOCATIONS_NAME,fnamelen);
     486                                    break;
     487                                case 1:
     488                                    fnamelen = strlen(ADOLC_VALUES_NAME);
     489                                    strncpy(currpos,ADOLC_VALUES_NAME,fnamelen);
     490                                    break;
     491                                case 2:
     492                                    fnamelen = strlen(ADOLC_OPERATIONS_NAME);
     493                                    strncpy(currpos,ADOLC_OPERATIONS_NAME,fnamelen);
     494                                    break;
     495                                case 3:
     496                                    fnamelen = strlen(ADOLC_TAYLORS_NAME);
     497                                    strncpy(currpos,ADOLC_TAYLORS_NAME,fnamelen);
     498                                    break;
     499                                }
     500                                currpos += fnamelen;
     501                                *currpos = '\0';
     502                            }
     503                            fprintf(DIAG_OUT, "ADOL-C info: using TAPE_DIR %s for all disk bound tapes\n",path);
     504                        } else
     505                            fprintf(DIAG_OUT, "ADOL-C warning: TAPE_DIR %s in .adolcrc is not an existing directory,\n will continue using %s for writing tapes\n", path, TAPE_DIR);
     506                    }
     507                    else
     508                        fprintf(DIAG_OUT, "ADOL-C warning: Unable to parse number in "
     509                                ".adolcrc!\n");
    435510                } else {
    436511                    *pos2 = 0;
  • stable/2.1/ADOL-C/src/taping_p.h

    r157 r180  
    613613void readConfigFile();
    614614
     615/* clear the tapeBaseNames that were alocated above in readConfigFile() */
     616void clearTapeBaseNames();
     617
    615618/****************************************************************************/
    616619/* This function sets the flag "newTape" if either a taylor buffer has been */
  • stable/2.1/ADOL-C/src/uni5_for.c

    r116 r180  
    486486    int    keep,        /* flag for reverse sweep */
    487487#endif
    488     double *basepoint,  /* independent variable values */
     488    const double *basepoint,  /* independent variable values */
    489489    double *argument,   /* Taylor coefficients (input) */
    490490    double *valuepoint, /* Taylor coefficients (output) */
  • stable/2.1/ADOL-C/test/Makefile.am

    r170 r180  
    1919fminmax_SOURCES         = fminmax.cpp
    2020
    21 INCLUDES                = -I$(top_builddir)/ADOL-C/src
     21INCLUDES                = -I$(top_builddir)/ADOL-C
    2222
    2323powexam_LDADD           = ../src/libadolc.la
  • stable/2.1/ADOL-C/test/Makefile.in

    r170 r180  
    220220powexam_SOURCES = powexam.cpp
    221221fminmax_SOURCES = fminmax.cpp
    222 INCLUDES = -I$(top_builddir)/ADOL-C/src
     222INCLUDES = -I$(top_builddir)/ADOL-C
    223223powexam_LDADD = ../src/libadolc.la
    224224speelpenning_LDADD = ../src/libadolc.la
  • stable/2.1/adolc.spec

    r170 r180  
    1 # spec file for package adolc (Version 2.1.10-stable)
     1# spec file for package adolc (Version 2.1.11-stable)
    22
    33# norootforbuild
    44
    5 %define ver %(echo 2.1.10-stable | sed s,-,_, )
    6 %define packver 2.1.10-stable
     5%define ver %(echo 2.1.11-stable | sed s,-,_, )
     6%define packver 2.1.11-stable
    77
    88Name:           adolc
  • stable/2.1/configure

    r170 r180  
    22# From configure.ac Revision.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.65 for adolc 2.1.10-stable.
     4# Generated by GNU Autoconf 2.65 for adolc 2.1.11-stable.
    55#
    66# Report bugs to <adol-c@list.coin-or.org>.
     
    703703PACKAGE_NAME='adolc'
    704704PACKAGE_TARNAME='adolc'
    705 PACKAGE_VERSION='2.1.10-stable'
    706 PACKAGE_STRING='adolc 2.1.10-stable'
     705PACKAGE_VERSION='2.1.11-stable'
     706PACKAGE_STRING='adolc 2.1.11-stable'
    707707PACKAGE_BUGREPORT='adol-c@list.coin-or.org'
    708708PACKAGE_URL=''
     
    14741474  # This message is too long to be a string in the A/UX 3.1 sh.
    14751475  cat <<_ACEOF
    1476 \`configure' configures adolc 2.1.10-stable to adapt to many kinds of systems.
     1476\`configure' configures adolc 2.1.11-stable to adapt to many kinds of systems.
    14771477
    14781478Usage: $0 [OPTION]... [VAR=VALUE]...
     
    15441544if test -n "$ac_init_help"; then
    15451545  case $ac_init_help in
    1546      short | recursive ) echo "Configuration of adolc 2.1.10-stable:";;
     1546     short | recursive ) echo "Configuration of adolc 2.1.11-stable:";;
    15471547   esac
    15481548  cat <<\_ACEOF
     
    16731673if $ac_init_version; then
    16741674  cat <<\_ACEOF
    1675 adolc configure 2.1.10-stable
     1675adolc configure 2.1.11-stable
    16761676generated by GNU Autoconf 2.65
    16771677
     
    24902490running configure, to aid debugging if configure makes a mistake.
    24912491
    2492 It was created by adolc $as_me 2.1.10-stable, which was
     2492It was created by adolc $as_me 2.1.11-stable, which was
    24932493generated by GNU Autoconf 2.65.  Invocation command line was
    24942494
     
    33033303# Define the identity of the package.
    33043304 PACKAGE='adolc'
    3305  VERSION='2.1.10-stable'
     3305 VERSION='2.1.11-stable'
    33063306
    33073307
     
    1590815908
    1590915909
    15910 $as_echo "#define ADOLC_PATCHLEVEL 10" >>confdefs.h
     15910$as_echo "#define ADOLC_PATCHLEVEL 11" >>confdefs.h
    1591115911
    1591215912ADOLC_VERSION=2
    1591315913ADOLC_SUBVERSION=1
    15914 ADOLC_PATCHLEVEL=10
     15914ADOLC_PATCHLEVEL=11
    1591515915
    1591615916
     
    1698116981# values after options handling.
    1698216982ac_log="
    16983 This file was extended by adolc $as_me 2.1.10-stable, which was
     16983This file was extended by adolc $as_me 2.1.11-stable, which was
    1698416984generated by GNU Autoconf 2.65.  Invocation command line was
    1698516985
     
    1704717047ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1704817048ac_cs_version="\\
    17049 adolc config.status 2.1.10-stable
     17049adolc config.status 2.1.11-stable
    1705017050configured by $0, generated by GNU Autoconf 2.65,
    1705117051  with options \\"\$ac_cs_config\\"
  • stable/2.1/configure.ac

    r170 r180  
    1010define([ADOLC_VER], [2])
    1111define([ADOLC_SUB], [1])
    12 define([ADOLC_LVL], [10])
     12define([ADOLC_LVL], [11])
    1313
    1414AC_PREREQ(2.57)
  • stable/2.1/windows/adolc.vcxproj

    r170 r180  
    7070    <ClCompile>
    7171      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    72       <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C\src;..\ADOL-C\src\drivers;..\ADOL-C\src\tapedoc;..\ADOL-C\src\sparse;..\ThirdParty\ColPack\$(IntDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C;..\ADOL-C\src;..\ThirdParty\ColPack\$(IntDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    7474      <WarningLevel>Level3</WarningLevel>
     
    9393    <ClCompile>
    9494      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    95       <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C\src;..\ADOL-C\src\drivers;..\ADOL-C\src\tapedoc;..\ADOL-C\src\sparse;..\ThirdParty\ColPack\$(IntDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     95      <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C;..\ADOL-C\src;..\ThirdParty\ColPack\$(IntDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9696      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    9797      <WarningLevel>Level3</WarningLevel>
     
    115115    <ClCompile>
    116116      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C\src;..\ADOL-C\src\drivers;..\ADOL-C\src\tapedoc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C;..\ADOL-C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119119      <WarningLevel>Level3</WarningLevel>
     
    140140    <ClCompile>
    141141      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    142       <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C\src;..\ADOL-C\src\drivers;..\ADOL-C\src\tapedoc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     142      <AdditionalIncludeDirectories>$(IntDir);..\ADOL-C;..\ADOL-C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    143143      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    144144      <WarningLevel>Level3</WarningLevel>
  • stable/2.1/windows/nosparse/config.h

    r162 r180  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 10
     14#define ADOLC_PATCHLEVEL 11
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.10-stable"
     119#define PACKAGE_STRING "adolc 2.1.11-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.10-stable"
     125#define PACKAGE_VERSION "2.1.11-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.10-stable"
     140#define VERSION "2.1.11-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/sparse/config.h

    r162 r180  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 10
     14#define ADOLC_PATCHLEVEL 11
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.10-stable"
     119#define PACKAGE_STRING "adolc 2.1.11-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.10-stable"
     125#define PACKAGE_VERSION "2.1.11-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.10-stable"
     140#define VERSION "2.1.11-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/x64/nosparse/config.h

    r162 r180  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 10
     14#define ADOLC_PATCHLEVEL 11
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.10-stable"
     119#define PACKAGE_STRING "adolc 2.1.11-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.10-stable"
     125#define PACKAGE_VERSION "2.1.11-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.10-stable"
     140#define VERSION "2.1.11-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/x64/sparse/config.h

    r162 r180  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 10
     14#define ADOLC_PATCHLEVEL 11
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.10-stable"
     119#define PACKAGE_STRING "adolc 2.1.11-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.10-stable"
     125#define PACKAGE_VERSION "2.1.11-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.10-stable"
     140#define VERSION "2.1.11-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
Note: See TracChangeset for help on using the changeset viewer.