Context Navigation

← Previous Change
Next Change →

Changeset 11995 for issm/trunk/src/mex/ParsePetscOptions/ParsePetscOptions.cpp

Timestamp:

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

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11994M

Location:

Files:

: 3 edited

. (modified) (2 props)
src/mex (modified) (1 prop)
src/mex/ParsePetscOptions/ParsePetscOptions.cpp (modified) (2 diffs)

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/src/mex

Property svn:ignore

old	new
	1	__pycache__
1	2	Makefile
2	3	.ignore.txt

issm/trunk/src/mex/ParsePetscOptions/ParsePetscOptions.cpp

-              r8910
+              r11995
         /*Input datasets: */
         FetchMatlabData(&parameters,PARAMETERS);
         FetchMatlabData(&petscoptionsfilename,PETSCOPTIONSFILENAME);
+        FetchData(&parameters,PARAMETERS);
+        FetchData(&petscoptionsfilename,PETSCOPTIONSFILENAME);
         petscoptionsfid=fopen(petscoptionsfilename,"r");
 …
         /*write output datasets: */
         WriteMatlabData(PARAMETERSOUT,parameters);
+        WriteData(PARAMETERSOUT,parameters);
         /*Free ressources: */

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

Download in other formats: