Context Navigation

← Previous Change
Next Change →

Changeset 11995 for issm/trunk/externalpackages/petsc

Timestamp:

04/16/12 14:57:18 (14 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11994M

Location:

Files:

: 3 edited
: 6 copied

. (modified) (2 props)
externalpackages/petsc (modified) (1 prop)
externalpackages/petsc/configs (copied) (copied from issm/trunk-jpl/externalpackages/petsc/configs )
externalpackages/petsc/configs/3.1 (copied) (copied from issm/trunk-jpl/externalpackages/petsc/configs/3.1 )
externalpackages/petsc/configs/3.1/win7 (copied) (copied from issm/trunk-jpl/externalpackages/petsc/configs/3.1/win7 )
externalpackages/petsc/configs/3.1/win7/petscfix.h.patch (copied) (copied from issm/trunk-jpl/externalpackages/petsc/configs/3.1/win7/petscfix.h.patch )
externalpackages/petsc/install-2.3.2-macosx64.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx64.sh )
externalpackages/petsc/install-3.1-win7.sh (modified) (2 diffs)
externalpackages/petsc/install-dev-linux64.sh (copied) (copied from issm/trunk-jpl/externalpackages/petsc/install-dev-linux64.sh )

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:ignore

-              old
+              new
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 11238,11528-11532,11534-11576,11578,11580-11581,11583-11614,11616-11618,11620-11680,11685-11707,11709,11711-11769,11771-11777,11780-11782,11784-11800,11803-11983,11986-11989,11992-11994

issm/trunk/externalpackages/petsc

Property svn:ignore

old	new
1	1	install
	2	install-3.1
2	3	src

issm/trunk/externalpackages/petsc/install-3.1-win7.sh

-              r11527
+              r11995
         --with-debugging=0 \
         --with-mpi=0 \
+        --download-c-blas-lapack=1
+        --download-c-blas-lapack=yes \
+        --with-cc='win32fe cl' \
+        --with-fc=0 \
+        --with-cxx='win32fe cl' \
+        --with-clanguage=cxx
 #./config/configure.py  \
 …
 make
 make install
+patch ../install/include/petscfix.h ../configs/3.1/win7/petscfix.h.patch

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: