Changeset 11874
- Timestamp:
- 04/03/12 12:13:58 (13 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/m4/issm_options.m4
r11862 r11874 4 4 5 5 dnl ISSM's internal options 6 dnl Debugging {{{1 7 AC_ARG_ENABLE([debugging],AS_HELP_STRING([--enable-debugging], 8 [turn debug support on]), 9 [enable_debugging=$enableval],[enable_debugging=no]) 6 dnl Debugging {{{ 7 AC_ARG_ENABLE([debugging], dnl feature 8 AS_HELP_STRING([--enable-debugging],[turn debug support on]), dnl help string 9 [enable_debugging=$enableval], dnl action if given 10 [enable_debugging=no]) dnl action if not given 10 11 if test "x$enable_debugging" = xyes; then 11 AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM.])12 fi 13 dnl }}} 14 dnl Serial build {{{ 112 AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM]) 13 fi 14 dnl }}} 15 dnl Serial build {{{ 15 16 AC_ARG_WITH([serial], 16 AS_HELP_STRING([--with-serial = value], 17 [serial compilation. ]), 18 [SERIAL_VALUE=$withval],[SERIAL_VALUE="yes"]) 17 AS_HELP_STRING([--with-serial = value],[serial compilation. ]), 18 [SERIAL_VALUE=$withval],[SERIAL_VALUE="yes"]) 19 19 AC_MSG_CHECKING(for serial compilation) 20 20 AM_CONDITIONAL([NOSERIAL], [test $SERIAL_VALUE = no]) … … 22 22 AC_MSG_RESULT($SERIAL_VALUE) 23 23 dnl }}} 24 dnl Parallel build {{{ 124 dnl Parallel build {{{ 25 25 AC_ARG_WITH([parallel], 26 AS_HELP_STRING([--with-parallel = value], 27 [parallel compilation. ]), 28 [PARALLEL_VALUE=$withval],[PARALLEL_VALUE="yes"]) 26 AS_HELP_STRING([--with-parallel = value], [parallel compilation. ]), 27 [PARALLEL_VALUE=$withval],[PARALLEL_VALUE="yes"]) 29 28 AC_MSG_CHECKING(for parallel compilation) 30 29 AM_CONDITIONAL([NOPARALLEL], [test $PARALLEL_VALUE = no]) … … 34 33 AC_SUBST([ISSMEXT]) 35 34 dnl }}} 36 dnl Serial or Parallel check {{{ 135 dnl Serial or Parallel check {{{ 37 36 dnl Check that at least serial or parallel builds have been requested! 38 37 if test "$SERIAL_VALUE" != "yes" ; then 39 38 if test "$PARALLEL_VALUE" != "yes"; then 40 AC_MSG_ERROR([cannot request --with-serial=no and --with-parallel=no at the same time!])39 AC_MSG_ERROR([cannot request --with-serial=no and --with-parallel=no at the same time!]) 41 40 fi 42 41 fi … … 44 43 45 44 dnl ISSM's externalpackages 46 dnl vendor{{{ 145 dnl vendor{{{ 47 46 AC_ARG_WITH([vendor], 48 AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), [VENDOR=$withval],[VENDOR=""]) 47 AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), 48 [VENDOR=$withval],[VENDOR=""]) 49 49 AC_MSG_CHECKING(for vendor compilers) 50 50 if test -n "$VENDOR"; then … … 92 92 dnl 1. See if matlab has been provided 93 93 AC_ARG_WITH([matlab-dir], 94 AS_HELP_STRING([--with-matlab-dir = DIR], 95 [matlab root directory. necessary for serial build.]), 96 [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) 94 AS_HELP_STRING([--with-matlab-dir = DIR], [matlab root directory. necessary for serial build.]), 95 [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) 97 96 98 97 AC_MSG_CHECKING([wether Matlab is enabled]) … … 219 218 AC_SUBST([MEXLINK]) 220 219 fi 221 222 dnl }}} 223 dnl triangle {{{1 220 dnl }}} 221 dnl triangle {{{ 224 222 AC_ARG_WITH([triangle-dir], 225 223 AS_HELP_STRING([--with-triangle-dir = DIR], [triangle root directory. necessary for serial build]), … … 262 260 AC_MSG_RESULT(ok) 263 261 dnl }}} 264 dnl dakota{{{ 1262 dnl dakota{{{ 265 263 AC_ARG_WITH([dakota-dir], 266 267 264 AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]), 265 [DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""]) 268 266 AC_MSG_CHECKING(for Dakota) 269 267 … … 295 293 AC_MSG_RESULT($HAVE_DAKOTA) 296 294 dnl }}} 297 dnl boost{{{ 1295 dnl boost{{{ 298 296 AC_ARG_WITH([boost-dir], 299 300 297 AS_HELP_STRING([--with-boost-dir = DIR], [boost root directory.]), 298 [BOOST_ROOT=$withval],[BOOST_ROOT=""]) 301 299 AC_MSG_CHECKING(for Boost) 302 300 … … 316 314 AC_MSG_RESULT($HAVE_BOOST) 317 315 dnl }}} 318 dnl python{{{ 1316 dnl python{{{ 319 317 AC_ARG_WITH([python-dir], 320 321 318 AS_HELP_STRING([--with-python-dir = DIR], [python root directory.]), 319 [PYTHON_ROOT=$withval],[PYTHON_ROOT=""]) 322 320 AC_MSG_CHECKING(for Python) 323 321 … … 342 340 AC_MSG_RESULT($HAVE_PYTHON) 343 341 dnl }}} 344 dnl python-numpy{{{ 1342 dnl python-numpy{{{ 345 343 AC_ARG_WITH([python-numpy-dir], 346 347 344 AS_HELP_STRING([--with-python-numpy-dir = DIR], [python-numpy root directory.]), 345 [PYTHON_NUMPY_ROOT=$withval],[PYTHON_NUMPY_ROOT=""]) 348 346 AC_MSG_CHECKING(for Python-Numpy) 349 347 … … 360 358 AC_MSG_RESULT($HAVE_PYTHON_NUMPY) 361 359 dnl }}} 362 dnl chaco{{{ 1360 dnl chaco{{{ 363 361 AC_ARG_WITH([chaco-dir], 364 365 362 AS_HELP_STRING([--with-chaco-dir = DIR], [chaco root directory.]), 363 [CHACO_ROOT=$withval],[CHACO_ROOT=""]) 366 364 AC_MSG_CHECKING(for Chaco) 367 365 … … 382 380 AC_MSG_RESULT($HAVE_CHACO) 383 381 dnl }}} 384 dnl scotch{{{ 1382 dnl scotch{{{ 385 383 AC_ARG_WITH([scotch-dir], 386 387 384 AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]), 385 [SCOTCH_ROOT=$withval],[SCOTCH_ROOT=""]) 388 386 AC_MSG_CHECKING(for Scotch) 389 387 … … 395 393 SCOTCHLIB="-L$SCOTCH_ROOT/lib -lnfioscotch -lnfioscotcherr -lnfioscotcherrexit -lscotchmetis" 396 394 397 398 395 AC_DEFINE([_HAVE_SCOTCH_],[1],[with Scotch in ISSM src]) 399 396 AC_SUBST([SCOTCHINCL]) … … 405 402 AC_MSG_RESULT($HAVE_SCOTCH) 406 403 dnl }}} 407 dnl adolc{{{ 1404 dnl adolc{{{ 408 405 AC_ARG_WITH([adolc-dir], 409 410 406 AS_HELP_STRING([--with-adolc-dir = DIR], [adolc root directory.]), 407 [ADOLC_ROOT=$withval],[ADOLC_ROOT="no"]) 411 408 AC_MSG_CHECKING(for ADOLC) 412 409 … … 433 430 AC_MSG_RESULT($HAVE_ADOLC) 434 431 dnl }}} 435 dnl adic2{{{ 1432 dnl adic2{{{ 436 433 AC_ARG_WITH([adic2-dir], 437 438 434 AS_HELP_STRING([--with-adic2-dir = DIR], [adic2 root directory.]), 435 [ADIC2_ROOT=$withval],[ADIC2_ROOT="no"]) 439 436 AC_MSG_CHECKING(for ADIC2) 440 437 … … 461 458 AC_MSG_RESULT($HAVE_ADIC2) 462 459 dnl }}} 463 dnl gsl{{{ 1460 dnl gsl{{{ 464 461 AC_ARG_WITH([gsl-dir], 465 466 462 AS_HELP_STRING([--with-gsl-dir = DIR], [gsl root directory.]), 463 [GSL_ROOT=$withval],[GSL_ROOT=""]) 467 464 AC_MSG_CHECKING(for Gsl) 468 465 … … 484 481 AC_MSG_RESULT($HAVE_GSL) 485 482 dnl }}} 486 dnl rose{{{ 1483 dnl rose{{{ 487 484 AC_ARG_WITH([rose-dir], 488 489 485 AS_HELP_STRING([--with-rose-dir = DIR], [rose root directory.]), 486 [ROSE_ROOT=$withval],[ROSE_ROOT=""]) 490 487 AC_MSG_CHECKING(for Rose) 491 488 … … 507 504 AC_MSG_RESULT($HAVE_ROSE) 508 505 dnl }}} 509 dnl metis{{{ 1506 dnl metis{{{ 510 507 AC_ARG_WITH([metis-dir], 511 AS_HELP_STRING([--with-metis-dir = DIR], 512 [metis root directory. necessary for serial build]), 513 [METIS_ROOT=$withval],[METIS_ROOT=""]) 508 AS_HELP_STRING([--with-metis-dir = DIR],[metis root directory. necessary for serial build]), 509 [METIS_ROOT=$withval],[METIS_ROOT=""]) 514 510 515 511 if test -d "$METIS_ROOT"; then … … 526 522 dnl defaults 527 523 HAVE_METIS=yes 528 529 524 530 525 if test "$METIS_VERSION" = "4" ; then 531 526 … … 563 558 fi 564 559 565 566 560 AC_DEFINE([_HAVE_METIS_],[1],[with Metis in ISSM src]) 567 561 AC_SUBST([METISINCL]) … … 572 566 573 567 if test $HAVE_METIS = no; then 574 AC_MSG_ERROR([--with-metis-dir missing. Metis is needed to run ISSM]);575 else 576 AC_MSG_RESULT($HAVE_METIS)577 fi 578 dnl }}} 579 dnl mpi{{{ 1568 AC_MSG_ERROR([--with-metis-dir missing. Metis is needed to run ISSM]); 569 else 570 AC_MSG_RESULT($HAVE_METIS) 571 fi 572 dnl }}} 573 dnl mpi{{{ 580 574 AC_MSG_CHECKING(for mpi) 581 575 AC_ARG_WITH([mpi-lib], 582 AS_HELP_STRING([--with-mpi-lib = otions], 583 [mpi options, for ex: "-L$MPIROOT -lmpich]), 584 [MPILIB=$withval],[MPILIB=""]) 576 AS_HELP_STRING([--with-mpi-lib = otions],[mpi options, for ex: "-L$MPIROOT -lmpich]), 577 [MPILIB=$withval],[MPILIB=""]) 585 578 586 579 AC_ARG_WITH([mpi-include], 587 AS_HELP_STRING([--with-mpi-include = DIR], 588 [mpi include directory, necessary for parallel build]), 589 [MPI_INCLUDE=$withval],[MPI_INCLUDE=""]) 580 AS_HELP_STRING([--with-mpi-include = DIR],[mpi include directory, necessary for parallel build]), 581 [MPI_INCLUDE=$withval],[MPI_INCLUDE=""]) 590 582 591 583 if test -z "$MPILIB" ; then … … 603 595 AC_MSG_RESULT(done) 604 596 dnl }}} 605 dnl petsc{{{ 1597 dnl petsc{{{ 606 598 AC_ARG_WITH([petsc-dir], 607 AS_HELP_STRING([--with-petsc-dir = DIR], 608 [petsc root directory, necessary for parallel build]), 609 [PETSC_ROOT=$withval],[PETSC_ROOT=""]) 599 AS_HELP_STRING([--with-petsc-dir = DIR],[petsc root directory, necessary for parallel build]), 600 [PETSC_ROOT=$withval],[PETSC_ROOT=""]) 610 601 611 dnl Used to be necessary, not anymore.612 dnl if test "$PARALLEL_VALUE" = "yes" ; then613 dnl if test "$PETSC_ROOT" = "" ; then614 dnl AC_MSG_ERROR([missing --with-petsc-dir argument for parallel compilation!])615 dnl fi616 dnl fi617 618 602 if test -d "$PETSC_ROOT"; then 619 603 AC_MSG_CHECKING(for petsc version) … … 626 610 627 611 AC_ARG_WITH([petsc-arch], 628 AS_HELP_STRING([--with-petsc-arch = DIR], 629 [petsc arch , necessary for parallel build]), 630 [PETSC_ARCH=$withval],[PETSC_ARCH=""]) 631 632 dnl Used to be necessary, not anymore. 633 dnl if test "$PARALLEL_VALUE" = "yes" ; then 634 dnl if test "$PETSC_ARCH" = "" ; then 635 dnl AC_MSG_ERROR([missing --with-petsc-arch argument for parallel compilation!]) 636 dnl fi 637 dnl fi 638 612 AS_HELP_STRING([--with-petsc-arch = DIR],[petsc arch , necessary for parallel build]), 613 [PETSC_ARCH=$withval],[PETSC_ARCH=""]) 614 639 615 AC_MSG_CHECKING(for Petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH) 640 641 616 642 617 if test -d "$PETSC_ROOT"; then … … 676 651 HAVE_PETSC=no 677 652 fi 678 679 dnl used to e necessary, not anymore.680 dnl if test $HAVE_PETSC = no; then681 dnl AC_MSG_ERROR([could not find petsc. user should specify --with-petsc-dir and --with-petsc-arch options. Petsc is needed to run ISSM!])682 dnl else683 dnl AC_MSG_RESULT($HAVE_PETSC)684 dnl fi685 653 686 654 AM_CONDITIONAL([PETSC], [test x$HAVE_PETSC = xyes]) 687 655 AC_MSG_RESULT($HAVE_PETSC) 688 656 dnl }}} 689 dnl tao{{{ 1657 dnl tao{{{ 690 658 AC_ARG_WITH([tao-dir], 691 AS_HELP_STRING([--with-tao-dir = DIR], [tao root directory.]), 692 [TAO_ROOT=$withval],[TAO_ROOT=""]) 693 AC_MSG_CHECKING(for Tao) 694 695 if test -d "$TAO_ROOT"; then 696 697 dnl defaults 698 HAVE_TAO=yes 699 TAOINCL="-I$TAO_ROOT/ -I$TAO_ROOT/include -I$TAO_ROOT/bmake/ " 700 TAOLIB="-L$TAO_ROOT/lib -ltao -lpetsc" 701 702 AC_DEFINE([_HAVE_TAO_],[1],[with Tao in ISSM src]) 703 AC_SUBST([TAOINCL]) 704 AC_SUBST([TAOLIB]) 705 706 else 659 AS_HELP_STRING([--with-tao-dir = DIR], [tao root directory.]), 660 [TAO_ROOT=$withval],[TAO_ROOT=""]) 661 AC_MSG_CHECKING(for Tao) 662 663 if test -d "$TAO_ROOT"; then 664 665 HAVE_TAO=yes 666 TAOINCL="-I$TAO_ROOT/ -I$TAO_ROOT/include -I$TAO_ROOT/bmake/ " 667 TAOLIB="-L$TAO_ROOT/lib -ltao -lpetsc" 668 669 AC_DEFINE([_HAVE_TAO_],[1],[with Tao in ISSM src]) 670 AC_SUBST([TAOINCL]) 671 AC_SUBST([TAOLIB]) 672 else 707 673 HAVE_TAO=no 708 709 710 dnl }}} 711 dnl mpiuni{{{ 1674 fi 675 AC_MSG_RESULT($HAVE_TAO) 676 dnl }}} 677 dnl mpiuni{{{ 712 678 dnl when running in serial mode, MPI must be ignored, and set to internal petsc mpiuni: 713 679 if test "$PARALLEL_VALUE" = "no" ; then … … 732 698 fi 733 699 dnl }}} 734 dnl slepc{{{ 1700 dnl slepc{{{ 735 701 AC_ARG_WITH([slepc-dir], 736 AS_HELP_STRING([--with-slepc-dir = DIR], 737 [slepc root directory]), 738 [SLEPC_ROOT=$withval],[SLEPC_ROOT=""]) 702 AS_HELP_STRING([--with-slepc-dir = DIR],[slepc root directory]), 703 [SLEPC_ROOT=$withval],[SLEPC_ROOT=""]) 739 704 740 705 AC_MSG_CHECKING(for Slepc headers and libraries in $SLEPC_ROOT) 741 706 if test -d "$SLEPC_ROOT"; then 742 743 744 dnl defaults745 707 HAVE_SLEPC=yes 746 708 SLEPCINCL=-I"$SLEPC_ROOT/include" … … 755 717 AC_MSG_RESULT($HAVE_SLEPC) 756 718 dnl }}} 757 dnl shapelib{{{ 1719 dnl shapelib{{{ 758 720 AC_ARG_WITH([shapelib-dir], 759 AS_HELP_STRING([--with-shapelib-dir = DIR], 760 [shapelib root directory]), 761 [SHAPELIB_ROOT=$withval],[SHAPELIB_ROOT=""]) 721 AS_HELP_STRING([--with-shapelib-dir = DIR], [shapelib root directory]), 722 [SHAPELIB_ROOT=$withval],[SHAPELIB_ROOT=""]) 762 723 763 724 AC_MSG_CHECKING(for Shapelib headers and libraries in $SHAPELIB_ROOT) 764 725 if test -d "$SHAPELIB_ROOT"; then 765 726 766 767 727 dnl defaults 768 728 HAVE_SHAPELIB=yes … … 778 738 AC_MSG_RESULT($HAVE_SHAPELIB) 779 739 dnl }}} 780 dnl scalapack{{{ 1740 dnl scalapack{{{ 781 741 AC_ARG_WITH([scalapack-dir], 782 AS_HELP_STRING([--with-scalapack-dir = DIR], 783 [scalapack root directory]), 784 [SCALAPACK_ROOT=$withval],[SCALAPACK_ROOT=""]) 742 AS_HELP_STRING([--with-scalapack-dir = DIR],[scalapack root directory]), 743 [SCALAPACK_ROOT=$withval],[SCALAPACK_ROOT=""]) 785 744 786 745 AC_MSG_CHECKING(for Scalapack headers and libraries in $SCALAPACK_ROOT) 787 746 if test -d "$SCALAPACK_ROOT"; then 788 747 789 790 748 dnl defaults 791 749 HAVE_SCALAPACK=yes … … 799 757 AC_MSG_RESULT($HAVE_SCALAPACK) 800 758 dnl }}} 801 dnl blas{{{ 1759 dnl blas{{{ 802 760 AC_ARG_WITH([blas-lapack-dir], 803 AS_HELP_STRING([--with-blas-lapack-dir = DIR], 804 [blas-lapack root directory]), 805 [BLASLAPACK_ROOT=$withval],[BLASLAPACK_ROOT=""]) 761 AS_HELP_STRING([--with-blas-lapack-dir = DIR],[blas-lapack root directory]), 762 [BLASLAPACK_ROOT=$withval],[BLASLAPACK_ROOT=""]) 806 763 807 764 AC_MSG_CHECKING(for Blas and Lapack headers and libraries in $BLASLAPACK_ROOT) 808 765 if test -d "$BLASLAPACK_ROOT"; then 809 810 766 811 767 dnl defaults … … 825 781 ;; 826 782 esac 827 828 829 783 830 784 AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src]) … … 836 790 AC_MSG_RESULT($HAVE_BLASLAPACK) 837 791 dnl }}} 838 dnl mkl{{{ 1792 dnl mkl{{{ 839 793 AC_ARG_WITH([mkl-dir], 840 AS_HELP_STRING([--with-mkl-dir = DIR], 841 [mkl root directory]), 842 [MKL_ROOT=$withval],[MKL_ROOT=""]) 794 AS_HELP_STRING([--with-mkl-dir = DIR],[mkl root directory]), 795 [MKL_ROOT=$withval],[MKL_ROOT=""]) 843 796 844 797 AC_MSG_CHECKING(for mkl headers and libraries in $MKL_ROOT) … … 857 810 AC_MSG_RESULT($HAVE_MKL) 858 811 dnl }}} 859 dnl plapack{{{ 1812 dnl plapack{{{ 860 813 AC_ARG_WITH([plapack-lib], 861 AS_HELP_STRING([--with-plapack-lib = lib], 862 [plapack library]), 863 [PLAPACK_LIB=$withval],[PLAPACK_LIB=""]) 814 AS_HELP_STRING([--with-plapack-lib = lib],[plapack library]), 815 [PLAPACK_LIB=$withval],[PLAPACK_LIB=""]) 864 816 AC_MSG_CHECKING(for Plapack libraries) 865 817 … … 889 841 AC_MSG_RESULT($HAVE_PLAPACK) 890 842 dnl }}} 891 dnl mumps{{{1 892 893 dnl Mumps directory 843 dnl mumps{{{ 894 844 AC_ARG_WITH([mumps-dir], 895 AS_HELP_STRING([--with-mumps-dir = DIR], 896 [mumps root directory]), 897 [MUMPS_ROOT=$withval],[MUMPS_ROOT=""]) 845 AS_HELP_STRING([--with-mumps-dir = DIR],[mumps root directory]), 846 [MUMPS_ROOT=$withval],[MUMPS_ROOT=""]) 898 847 899 848 AC_MSG_CHECKING(for Mumps headers and libraries in $MUMPS_ROOT) … … 917 866 AC_MSG_RESULT($HAVE_MUMPS) 918 867 dnl }}} 919 dnl blacs{{{ 1868 dnl blacs{{{ 920 869 AC_ARG_WITH([blacs-dir], 921 AS_HELP_STRING([--with-blacs-dir = DIR], 922 [blacs root directory]), 870 AS_HELP_STRING([--with-blacs-dir = DIR],[blacs root directory]), 923 871 [BLACS_ROOT=$withval],[BLACS_ROOT=""]) 924 872 … … 939 887 AC_MSG_RESULT($HAVE_BLACS) 940 888 dnl }}} 941 dnl hypre{{{ 1889 dnl hypre{{{ 942 890 AC_ARG_WITH([hypre-dir], 943 AS_HELP_STRING([--with-hypre-dir = DIR], 944 [hypre root directory]), 891 AS_HELP_STRING([--with-hypre-dir = DIR],[hypre root directory]), 945 892 [HYPRE_ROOT=$withval],[HYPRE_ROOT=""]) 946 893 … … 961 908 AC_MSG_RESULT($HAVE_HYPRE) 962 909 dnl }}} 963 dnl ml{{{ 1910 dnl ml{{{ 964 911 AC_ARG_WITH([ml-dir], 965 AS_HELP_STRING([--with-ml-dir = DIR], 966 [ml root directory]), 912 AS_HELP_STRING([--with-ml-dir = DIR],[ml root directory]), 967 913 [ML_ROOT=$withval],[ML_ROOT=""]) 968 914 … … 983 929 AC_MSG_RESULT($HAVE_ML) 984 930 dnl }}} 985 dnl math{{{ 1931 dnl math{{{ 986 932 AC_MSG_CHECKING(for math library) 987 933 AC_ARG_WITH([math-lib], 988 AS_HELP_STRING([--with-math-lib = otions], 989 [math options, for ex: "/usr/lib/libm.a]), 990 [MATH_LIB=$withval],[MATH_LIB=""]) 934 AS_HELP_STRING([--with-math-lib = otions],[math options, for ex: "/usr/lib/libm.a]), 935 [MATH_LIB=$withval],[MATH_LIB=""]) 991 936 992 937 dnl check that --with-math-lib may have been provided … … 1000 945 AC_MSG_RESULT(done) 1001 946 dnl }}} 1002 dnl fortran{{{ 1947 dnl fortran{{{ 1003 948 dnl fortran library option 1004 949 AC_MSG_CHECKING(for fortran library) 1005 950 AC_ARG_WITH([fortran-lib], 1006 AS_HELP_STRING([--with-fortran-lib = options], 1007 [fortran options, for ex: "/usr/lib/gfortran.a]), 1008 [FORTRAN_LIB=$withval],[FORTRAN_LIB=""]) 951 AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]), 952 [FORTRAN_LIB=$withval],[FORTRAN_LIB=""]) 1009 953 1010 954 dnl check that --with-fortran-lib may have been provided … … 1018 962 AC_MSG_RESULT(done) 1019 963 dnl }}} 1020 dnl graphics{{{ 1964 dnl graphics{{{ 1021 965 AC_MSG_CHECKING(for graphics library) 1022 966 AC_ARG_WITH([graphics-lib], 1023 AS_HELP_STRING([--with-graphics-lib = options], 1024 [graphics options, for ex: "/usr/X11/lib/libX11.a]), 1025 [GRAPHICS_LIB=$withval],[GRAPHICS_LIB=""]) 967 AS_HELP_STRING([--with-graphics-lib = options],[graphics options, for ex: "/usr/X11/lib/libX11.a]), 968 [GRAPHICS_LIB=$withval],[GRAPHICS_LIB=""]) 1026 969 1027 970 dnl check that --with-graphics-lib may have been provided … … 1035 978 AC_MSG_RESULT(done) 1036 979 dnl }}} 1037 dnl with-steadystate{{{1 1038 AC_ARG_WITH([steadystate],AS_HELP_STRING([--with-steadystate = YES], [compile with steadystate capabilities (default is yes)]),[STEADYSTATE=$withval],[STEADYSTATE=yes]) 980 dnl with-steadystate{{{ 981 AC_ARG_WITH([steadystate], 982 AS_HELP_STRING([--with-steadystate = YES],[compile with steadystate capabilities (default is yes)]), 983 [STEADYSTATE=$withval],[STEADYSTATE=yes]) 1039 984 AC_MSG_CHECKING(for steadystate capability compilation) 1040 985 … … 1051 996 AC_MSG_RESULT($HAVE_STEADYSTATE) 1052 997 dnl }}} 1053 dnl with-transient{{{1 1054 AC_ARG_WITH([transient],AS_HELP_STRING([--with-transient = YES], [compile with transient capabilities (default is yes)]),[TRANSIENT=$withval],[TRANSIENT=yes]) 998 dnl with-transient{{{ 999 AC_ARG_WITH([transient], 1000 AS_HELP_STRING([--with-transient = YES], [compile with transient capabilities (default is yes)]), 1001 [TRANSIENT=$withval],[TRANSIENT=yes]) 1055 1002 AC_MSG_CHECKING(for transient capability compilation) 1056 1003 … … 1067 1014 AC_MSG_RESULT($HAVE_TRANSIENT) 1068 1015 dnl }}} 1069 dnl with-thermal{{{1 1070 AC_ARG_WITH([thermal],AS_HELP_STRING([--with-thermal = YES], [compile with thermal capabilities (default is yes)]),[THERMAL=$withval],[THERMAL=yes]) 1016 dnl with-thermal{{{ 1017 AC_ARG_WITH([thermal], 1018 AS_HELP_STRING([--with-thermal = YES], [compile with thermal capabilities (default is yes)]), 1019 [THERMAL=$withval],[THERMAL=yes]) 1071 1020 AC_MSG_CHECKING(for thermal capability compilation) 1072 1021 … … 1083 1032 AC_MSG_RESULT($HAVE_THERMAL) 1084 1033 dnl }}} 1085 dnl with-prognostic{{{1 1086 AC_ARG_WITH([prognostic],AS_HELP_STRING([--with-prognostic = YES], [compile with prognostic capabilities (default is yes)]),[PROGNOSTIC=$withval],[PROGNOSTIC=yes]) 1034 dnl with-prognostic{{{ 1035 AC_ARG_WITH([prognostic], 1036 AS_HELP_STRING([--with-prognostic = YES], [compile with prognostic capabilities (default is yes)]), 1037 [PROGNOSTIC=$withval],[PROGNOSTIC=yes]) 1087 1038 AC_MSG_CHECKING(for prognostic capability compilation) 1088 1039 … … 1099 1050 AC_MSG_RESULT($HAVE_PROGNOSTIC) 1100 1051 dnl }}} 1101 dnl with-control{{{1 1102 AC_ARG_WITH([control],AS_HELP_STRING([--with-control = YES], [compile with control capabilities (default is yes)]),[CONTROL=$withval],[CONTROL=yes]) 1052 dnl with-control{{{ 1053 AC_ARG_WITH([control], 1054 AS_HELP_STRING([--with-control = YES], [compile with control capabilities (default is yes)]), 1055 [CONTROL=$withval],[CONTROL=yes]) 1103 1056 AC_MSG_CHECKING(for control capability compilation) 1104 1057 … … 1115 1068 AC_MSG_RESULT($HAVE_CONTROL) 1116 1069 dnl }}} 1117 dnl with-hydrology{{{1 1118 AC_ARG_WITH([hydrology],AS_HELP_STRING([--with-hydrology = YES], [compile with hydrology capabilities (default is yes)]),[HYDROLOGY=$withval],[HYDROLOGY=yes]) 1070 dnl with-hydrology{{{ 1071 AC_ARG_WITH([hydrology], 1072 AS_HELP_STRING([--with-hydrology = YES], [compile with hydrology capabilities (default is yes)]), 1073 [HYDROLOGY=$withval],[HYDROLOGY=yes]) 1119 1074 AC_MSG_CHECKING(for hydrology capability compilation) 1120 1075 … … 1131 1086 AC_MSG_RESULT($HAVE_HYDROLOGY) 1132 1087 dnl }}} 1133 dnl with-diagnostic{{{1 1134 AC_ARG_WITH([diagnostic],AS_HELP_STRING([--with-diagnostic = YES], [compile with diagnostic capabilities (default is yes)]),[DIAGNOSTIC=$withval],[DIAGNOSTIC=yes]) 1088 dnl with-diagnostic{{{ 1089 AC_ARG_WITH([diagnostic], 1090 AS_HELP_STRING([--with-diagnostic = YES], [compile with diagnostic capabilities (default is yes)]), 1091 [DIAGNOSTIC=$withval],[DIAGNOSTIC=yes]) 1135 1092 AC_MSG_CHECKING(for diagnostic capability compilation) 1136 1093 … … 1147 1104 AC_MSG_RESULT($HAVE_DIAGNOSTIC) 1148 1105 dnl }}} 1149 dnl with-balanced{{{1 1150 AC_ARG_WITH([balanced],AS_HELP_STRING([--with-balanced = YES], [compile with balanced capabilities (default is yes)]),[BALANCED=$withval],[BALANCED=yes]) 1106 dnl with-balanced{{{ 1107 AC_ARG_WITH([balanced], 1108 AS_HELP_STRING([--with-balanced = YES], [compile with balanced capabilities (default is yes)]), 1109 [BALANCED=$withval],[BALANCED=yes]) 1151 1110 AC_MSG_CHECKING(for balanced capability compilation) 1152 1111 … … 1163 1122 AC_MSG_RESULT($HAVE_BALANCED) 1164 1123 dnl }}} 1165 dnl with-responses{{{1 1166 AC_ARG_WITH([responses],AS_HELP_STRING([--with-responses = YES], [compile with responses capabilities (default is yes)]),[RESPONSES=$withval],[RESPONSES=yes]) 1124 dnl with-responses{{{ 1125 AC_ARG_WITH([responses], 1126 AS_HELP_STRING([--with-responses = YES], [compile with responses capabilities (default is yes)]), 1127 [RESPONSES=$withval],[RESPONSES=yes]) 1167 1128 AC_MSG_CHECKING(for responses capability compilation) 1168 1129 … … 1179 1140 AC_MSG_RESULT($HAVE_RESPONSES) 1180 1141 dnl }}} 1181 dnl with-slope{{{1 1182 AC_ARG_WITH([slope],AS_HELP_STRING([--with-slope = YES], [compile with slope capabilities (default is yes)]),[SLOPE=$withval],[SLOPE=yes]) 1142 dnl with-slope{{{ 1143 AC_ARG_WITH([slope], 1144 AS_HELP_STRING([--with-slope = YES], [compile with slope capabilities (default is yes)]), 1145 [SLOPE=$withval],[SLOPE=yes]) 1183 1146 AC_MSG_CHECKING(for slope capability compilation) 1184 1147 … … 1195 1158 AC_MSG_RESULT($HAVE_SLOPE) 1196 1159 dnl }}} 1197 dnl with-groundingline{{{1 1198 AC_ARG_WITH([groundingline],AS_HELP_STRING([--with-groundingline = YES], [compile with groundingline capabilities (default is yes)]),[GROUNDINGLINE=$withval],[GROUNDINGLINE=yes]) 1160 dnl with-groundingline{{{ 1161 AC_ARG_WITH([groundingline], 1162 AS_HELP_STRING([--with-groundingline = YES], [compile with groundingline capabilities (default is yes)]), 1163 [GROUNDINGLINE=$withval],[GROUNDINGLINE=yes]) 1199 1164 AC_MSG_CHECKING(for groundingline capability compilation) 1200 1165 … … 1211 1176 AC_MSG_RESULT($HAVE_GROUNDINGLINE) 1212 1177 dnl }}} 1213 dnl with-rifts{{{1 1214 AC_ARG_WITH([rifts],AS_HELP_STRING([--with-rifts = YES], [compile with rifts capabilities (default is yes)]),[RIFTS=$withval],[RIFTS=yes]) 1178 dnl with-rifts{{{ 1179 AC_ARG_WITH([rifts], 1180 AS_HELP_STRING([--with-rifts = YES], [compile with rifts capabilities (default is yes)]), 1181 [RIFTS=$withval],[RIFTS=yes]) 1215 1182 AC_MSG_CHECKING(for rifts capability compilation) 1216 1183 … … 1227 1194 AC_MSG_RESULT($HAVE_RIFTS) 1228 1195 dnl }}} 1229 dnl with-3d{{{1 1230 AC_ARG_WITH([3d],AS_HELP_STRING([--with-3d = YES], [compile with 3d capabilities (default is yes)]),[THREED=$withval],[THREED=yes]) 1196 dnl with-3d{{{ 1197 AC_ARG_WITH([3d], 1198 AS_HELP_STRING([--with-3d = YES], [compile with 3d capabilities (default is yes)]), 1199 [THREED=$withval],[THREED=yes]) 1231 1200 AC_MSG_CHECKING(for 3d capability compilation) 1232 1201 … … 1234 1203 1235 1204 dnl defaults 1236 HAVE_ THREED=yes1237 1238 AC_DEFINE([_HAVE_ THREED_],[1],[with 3d capability])1239 else 1240 HAVE_ THREED=no1241 fi 1242 AM_CONDITIONAL([THREED], [test x$HAVE_ THREED = xyes])1243 AC_MSG_RESULT($HAVE_ THREED)1244 dnl }}} 1245 dnl checks{{{ 11205 HAVE_3D=yes 1206 1207 AC_DEFINE([_HAVE_3D_],[1],[with 3d capability]) 1208 else 1209 HAVE_3D=no 1210 fi 1211 AM_CONDITIONAL([THREED], [test x$HAVE_3D = xyes]) 1212 AC_MSG_RESULT($HAVE_3D) 1213 dnl }}} 1214 dnl checks{{{ 1246 1215 AC_MSG_CHECKING(checking consistency between all libraries) 1247 1216 … … 1269 1238 1270 1239 dnl other options 1271 dnl optimization{{{ 11240 dnl optimization{{{ 1272 1241 dnl bypass standard optimization -g -O2 ? 1273 1242 AC_ARG_WITH([cxxoptflags], 1274 1275 1243 AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]), 1244 [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"]) 1276 1245 AC_MSG_CHECKING(for C++ optimization flags) 1277 1246 AC_SUBST([CXXOPTFLAGS]) … … 1279 1248 1280 1249 dnl }}} 1281 dnl multithreading{{{ 11250 dnl multithreading{{{ 1282 1251 AC_ARG_WITH([numthreads], 1283 AS_HELP_STRING([--with-numthreads = NUMTHREADS_VALUE], 1284 [numthreads, default is 1. ]), 1285 [NUMTHREADS_VALUE=$withval],[NUMTHREADS_VALUE=1]) 1252 AS_HELP_STRING([--with-numthreads = NUMTHREADS_VALUE],[numthreads, default is 1. ]), 1253 [NUMTHREADS_VALUE=$withval],[NUMTHREADS_VALUE=1]) 1286 1254 AC_MSG_CHECKING(for number of threads) 1287 1255 dnl defaults … … 1309 1277 AC_MSG_RESULT($NUMTHREADS_VALUE) 1310 1278 dnl }}} 1311 dnl 64bit {{{ 11279 dnl 64bit {{{ 1312 1280 AC_ARG_WITH([64bit-indices], 1313 1314 1281 AS_HELP_STRING([--with-64bit-indices = bool], [use 64 bit integers, default 0, ex: --with-64bit-indices=1]), 1282 [USE_64BIT_INDICES=$withval],[USE_64BIT_INDICES=0]) 1315 1283 AC_MSG_CHECKING(for 64 bit indices) 1316 1317 1284 1318 1285 if test "$USE_64BIT_INDICES" == "1"; then … … 1323 1290 AC_MSG_RESULT($USE_64BIT_INDICES) 1324 1291 dnl }}} 1325 1326 1292 ]) -
issm/trunk-jpl/src/c/Container/DataSet.cpp
r11292 r11874 230 230 dataset->AddObject(triavertexinput);} 231 231 break; 232 #ifdef _HAVE_ THREED_232 #ifdef _HAVE_3D_ 233 233 case PentaP1InputEnum:{ 234 234 PentaP1Input* pentavertexinput=NULL; … … 264 264 dataset->AddObject(triavertexelementresult);} 265 265 break; 266 #ifdef _HAVE_ THREED_266 #ifdef _HAVE_3D_ 267 267 case PentaP1ElementResultEnum:{ 268 268 PentaP1ElementResult* pentavertexelementresult=NULL; -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp
r11001 r11874 46 46 /*Fetch data needed: */ 47 47 iomodel->FetchData(4,MeshElementsEnum,MeshElementconnectivityEnum,MaterialsRheologyBEnum,MaterialsRheologyNEnum); 48 #ifdef _HAVE_ THREED_48 #ifdef _HAVE_3D_ 49 49 if(dim==3)iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum); 50 50 #endif … … 57 57 /*Create and add tria element to elements dataset: */ 58 58 if(dim==2) elements->AddObject(new Tria(i+1,i,i,iomodel,nummodels)); 59 #ifdef _HAVE_ THREED_59 #ifdef _HAVE_3D_ 60 60 else elements->AddObject(new Penta(i+1,i,i,iomodel,nummodels)); 61 61 #endif -
issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp
r11679 r11874 458 458 case MacAyeal2dIceFrontEnum: 459 459 return CreatePVectorDiagnosticMacAyeal2d(); 460 #ifdef _HAVE_ THREED_460 #ifdef _HAVE_3D_ 461 461 case MacAyeal3dIceFrontEnum: 462 462 return CreatePVectorDiagnosticMacAyeal3d(); … … 563 563 /*}}}*/ 564 564 #endif 565 #ifdef _HAVE_ THREED_565 #ifdef _HAVE_3D_ 566 566 /*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{1*/ 567 567 ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal3d(void){ -
issm/trunk-jpl/src/c/objects/Loads/Icefront.h
r11679 r11874 93 93 ElementVector* CreatePVectorDiagnosticMacAyeal2d(void); 94 94 #endif 95 #ifdef _HAVE_ THREED_95 #ifdef _HAVE_3D_ 96 96 ElementVector* CreatePVectorDiagnosticMacAyeal3d(void); 97 97 ElementVector* CreatePVectorDiagnosticPattyn(void); -
issm/trunk-jpl/src/c/objects/Materials/Matice.cpp
r11695 r11874 778 778 779 779 /*if 3d*/ 780 #ifdef _HAVE_ THREED_780 #ifdef _HAVE_3D_ 781 781 else if(dim==3){ 782 782
Note:
See TracChangeset
for help on using the changeset viewer.