Context Navigation

ElementsAndVerticesPartitioning.cpp

Timestamp:

05/01/12 17:28:47 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into branch through revision 12167

Location:

issm/branches/trunk-jpl-damage

Files:

Property svn:ignore

-              old
+              new
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in
 stamp-h1
 svn-commit*
-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

-              r9733
+              r12168
         else elements_width=6; //penta elements
-        #ifdef _PARALLEL_
         /*Determine parallel partitioning of elements: we use Metis for now. First load the data, then partition*/
         if(dim==2){
 …
         xfree((void**)&elements);
         xfree((void**)&elements2d);
-        #else
-        /*In serial mode, epart is full of 0: all elements belong to cpu 0: */
-        epart=(int*)xcalloc(numberofelements,sizeof(int));
-        #endif
         /*Deal with rifts, they have to be included into one partition only, not several: */

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

/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