Changeset 17048

Timestamp:

12/23/13 13:36:50 (11 years ago)

Author:

Eric.Larour

Message:

CHG: added MisfitArea.

File:

• issm/trunk-jpl/src/c/classes/Misfit.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Misfit.h

@@ -116 +116 @@
                          IssmDouble all_misfit_t=0;
                          IssmDouble dt;
-                         IssmDouble area;
+                         IssmDouble area_t;
+                         IssmDouble all_area_t;
                          IssmDouble time,starttime,finaltime;
 
@@ -126 +127 @@
                          if(this->lock)return misfit/(time-starttime);
 
+
                          for(i=0;i<femmodel->elements->Size();i++){
                                  Element* element=(Element*)femmodel->elements->GetObjectByOffset(i);
                                  misfit_t+=element->Misfit(model_enum,observation_enum,weights_enum);
+                                 area_t+=element->MisfitArea(weights_enum);
                          }
 
                          ISSM_MPI_Allreduce ( (void*)&misfit_t,(void*)&all_misfit_t,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                         ISSM_MPI_Allreduce ( (void*)&area_t,(void*)&all_area_t,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                         area_t=all_area_t;
                          misfit_t=all_misfit_t;
                          
                          /*Divide by surface area: */
-                         SurfaceAreax(&area,femmodel);
-                         misfit_t=misfit_t/area;
+                         misfit_t=misfit_t/area_t;
 
                          /*Recover delta_t: */