Changeset 14739

Timestamp:

04/24/13 12:09:46 (12 years ago)

Author:

Eric.Larour

Message:

NEW: GiaDeflectionCorex fortran code from Erik Ivins.
Hookup in issm_options.m4 to math77 library, and conditional compilation of gia code dependent upon
availability of math77 library.

Location:

issm/trunk-jpl

Files:

• configs/config-macosx64-larour-gia.sh (added)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (3 diffs)
• src/c/modules/GiaDeflectionCorex/distme.f (added)
• src/c/modules/GiaDeflectionCorex/freed.f (added)
• src/c/modules/GiaDeflectionCorex/ojrule.f (added)
• src/c/modules/GiaDeflectionCorex/pwise.f (added)
• src/c/modules/GiaDeflectionCorex/qwise.f (added)
• src/c/modules/GiaDeflectionCorex/stot.f (added)
• src/c/modules/GiaDeflectionCorex/what0.f (added)

issm/trunk-jpl/m4/issm_options.m4

@@ -1381 +1381 @@
         AC_MSG_RESULT($HAVE_RIFTS)
         dnl }}}
+        dnl math77{{{
+        AC_ARG_WITH([math77-dir],
+                AS_HELP_STRING([--with-math77-dir=DIR], [math77 root directory.]),
+                [MATH77_ROOT=$withval],[MATH77_ROOT=""]) 
+        AC_MSG_CHECKING(for math77)
+
+        if test -d "$MATH77_ROOT"; then
+
+          HAVE_MATH77=yes
+          MATH77LIB="-L$MATH77_ROOT/ -lmath77"
+
+          AC_DEFINE([_HAVE_MATH77_],[1],[with math77 in ISSM src])
+          AC_SUBST([MATH77LIB])
+        else
+                HAVE_MATH77=no
+        fi
+        AC_MSG_RESULT($HAVE_MATH77)
+        dnl }}}
         dnl with-gia{{{
         AC_ARG_WITH([gia],
                 AS_HELP_STRING([--with-gia = YES], [compile with gia capabilities (default is yes)]),
-                [GIA=$withval],[GIA=yes]) 
+                [GIA=$withval],[GIA=no]) 
         AC_MSG_CHECKING(for gia capability compilation)
 
         if test "x$GIA" = "xyes"; then
-
+          
+          if test "x$HAVE_MATH77" = "xno"; then
+                  HAVE_GIA=no
+                  AC_MSG_ERROR([gia requires compilation of math77 library! Reconfigure with --with-math77 option on]);
+          else
                 dnl defaults
                 HAVE_GIA=yes
-
                 AC_DEFINE([_HAVE_GIA_],[1],[with gia capability])
+          fi
+
         else
                 HAVE_GIA=no

issm/trunk-jpl/src/c/Makefile.am

@@ -510 +510 @@
                            ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp\
                            ./modules/GiaDeflectionCorex/GiaDeflectionCorex.h\
+                           ./modules/GiaDeflectionCorex/distme.f\
+                           ./modules/GiaDeflectionCorex/freed.f\
+                           ./modules/GiaDeflectionCorex/ojrule.f\
+                           ./modules/GiaDeflectionCorex/pwise.f\
+                           ./modules/GiaDeflectionCorex/qwise.f\
+                           ./modules/GiaDeflectionCorex/stot.f\
+                           ./modules/GiaDeflectionCorex/what0.f\
                            ./classes/GiaDeflectionCoreArgs.h
 
@@ -918 +925 @@
 libISSMCore_a_SOURCES  = $(issm_sources)
 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
+libISSMCore_a_FFLAGS = $(AM_FFLAGS)
 
 if SHAREDLIBS
@@ -925 +933 @@
 libISSMCore_la_SOURCES  = $(issm_sources)
 libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
+libISSMCore_la_FFLAGS = $(AM_FFLAGS)
 
 libISSMOverload_la_SOURCES = ./shared/String/stricmp.c