![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
- Timestamp:
- 05/01/12 17:28:47 (13 years ago)
- Location:
- issm/branches/trunk-jpl-damage
- Files:
-
- 2 edited
-
. (modified) (2 props)
-
src/c/shared/Numerics/OptionsFromAnalysis.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/branches/trunk-jpl-damage
- Property svn:ignore
-
old new 7 7 config.status 8 8 configure 9 doxygen10 9 ISSM.paf 11 10 ISSM.ppf 12 11 ISSM.ppf_cache 13 12 libtool 14 list15 13 Makefile 16 14 Makefile.in 17 15 stamp-h1 18 16 svn-commit* 19 nightlylog
-
- Property svn:mergeinfo changed
/issm/trunk merged: 11526,11533,11681-11682,11710,11778-11779,11995 /issm/trunk-jpl merged: 11992-11994,11996-12003,12005-12113,12115-12161,12163-12166
- Property svn:ignore
-
issm/branches/trunk-jpl-damage/src/c/shared/Numerics/OptionsFromAnalysis.cpp
r12004 r12168 30 30 parameters->FindParam(&strings,&numanalyses,PetscOptionsStringsEnum); 31 31 32 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) //do not take this away, because ISSM loads analyses as a Double Param instead of a DoubleVec Param when running with only 1 analysis33 if(numanalyses==1){ analyses=(double*)xmalloc(1*sizeof(double)); parameters->FindParam(analyses,PetscOptionsAnalysesEnum);34 }35 else parameters->FindParam(&analyses,&dummy,PetscOptionsAnalysesEnum);36 #else37 32 parameters->FindParam(&analyses,&dummy,PetscOptionsAnalysesEnum); 38 #endif39 33 40 34 if(numanalyses==0)return NULL; //we did not find petsc options, don't bother.
Note:
See TracChangeset
for help on using the changeset viewer.
