Changeset 13530 for issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp

Timestamp:

10/04/12 10:33:59 (12 years ago)

Author:

Eric.Larour

Message:

CHG and NEW:
macros.h: changed name of ISSMBOOT and ISSMEND macros to IssmBoot and IssmEnd.
AdolcEdf: moved adolc_edf to src/c/classes and renamed it AdolcEdf. Updated all headers and Makefile.am
accordingly.
Noticed dual existence of objects.h in src/c/classes and src/c/classes/objects! Deleted first one and
fixed references accordingly in bamg and kriging.
Created new EnvironmentInit routine to initialize Petsc and MPI. Updated issm.cpp and kriging.cpp accordingly.

File:

• issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp

@@ -12 +12 @@
 #include "./Solverx.h"
 #include "../../shared/shared.h"
+#include "../../classes/classes.h"
 #include "../../include/include.h"
 #include "../../io/io.h"
@@ -17 +18 @@
 #ifdef _HAVE_GSL_
 #include <gsl/gsl_linalg.h>
-#endif
-
-#ifdef _HAVE_ADOLC_
-#include "../../shared/Numerics/adolc_edf.h"
 #endif