Context Navigation

ElementResponsex.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

-              r10703
+              r12168
         /*Broadcast whether we found the element: */
+        #ifdef _HAVE_MPI_
         MPI_Allreduce ( &found,&sumfound,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
         if(!sumfound)_error_("%s%i%s","could not find material with id",index," to compute ElementResponse");
+        #endif
         /*Ok, we found the element, compute responseocity: */
 …
         /*Broadcast and plug into response: */
+        #ifdef _HAVE_MPI_
         MPI_Allreduce ( &cpu_found,&cpu_found,1,MPI_INT,MPI_MAX,MPI_COMM_WORLD);
         MPI_Bcast(&response,1,MPI_DOUBLE,cpu_found,MPI_COMM_WORLD);
+        #endif
         *presponse=response;

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