Context Navigation

← Previous Change
Next Change →

Changeset 16137 for issm/trunk/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

Files:

: 5 edited

. (modified) (2 props)
src (modified) (1 prop)
src/c (modified) (1 prop)
src/c/modules/SurfaceAbsVelMisfitx (modified) (1 prop)
src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:ignore

old	new
	1	nightlylog
	2	configure.sh
1	3	par
2	4	ad

Property svn:mergeinfo changed
/issm/trunk-jpl merged: 15397-15401,15403-15487,15489-15701,15704-15735,15737-16076,16082-16133

issm/trunk/src

Property svn:mergeinfo changed

/issm/trunk-jpl/src

merged: 15397-15401,15403-15415,15417-15423,15425,15427-15459,15461-15468,15470,15473-15478,15480,15482-15487,15489-15497,15501-15502,15504-15509,15511-15523,15525,15527-15528,15530,15533,15535,15538-15541,15544,15556-15557,15559,15564,15567-15568,15570,15572,15576,15583,15594-15596,15600-15604,15611-15619,15621,15623-15631,15633-15645,15649-15650,15654-15658,15660,15662,15667,15670,15684,15688-15690,15694-15696,15701,15704-15705,15707,15711-15715,15717-15718,15720,15722-15724,15726-15728,15730-15732,15734,15737-15742,15744-15749,15751-15754,15757-15758,15764-15765,15767-15773,15775-15777,15779,15782-15783,15785-15790,15792-15798,15801-15802,15805-15810,15812,15814-15817,15823-15832,15834-15853,15855-15870,15872-15873,15877-15879,15881-15883,15889-15899,15905-15909,15913-15915,15917-15919,15923-15925,15929,15931,15933,15937-15947,15951-15952,15954,15956-15957,15959-15965,15967-15974,15976,15978-15980,15982-15983,15986-15987,15990-15993,15995,15998-15999,16005,16007-16019,16021-16038,16040,16042-16043,16045,16047-16053,16055-16056,16058,16065-16066,16068,16070-16071,16074,16076,16082-16088,16090-16091,16094-16102,16105,16107-16121,16124-16132

issm/trunk/src/c

Property svn:ignore

old	new
14	14	probe.results
15	15	stXXXX*
16
	16	.deps
	17	.dirstamp

issm/trunk/src/c/modules/SurfaceAbsVelMisfitx
- Property svn:ignore set to
  .deps
  .dirstamp

issm/trunk/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp

-              r15396
+              r16137
         /*Sum all J from all cpus of the cluster:*/
+        #ifdef _HAVE_MPI_
+        MPI_Reduce (&J,&J_sum,1,MPI_DOUBLE,MPI_SUM,0,IssmComm::GetComm() );
+        MPI_Bcast(&J_sum,1,MPI_DOUBLE,0,IssmComm::GetComm());
+        ISSM_MPI_Reduce (&J,&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
+        ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
         J=J_sum;
-        #endif
         /*Assign output pointers: */

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

Download in other formats: