Changeset 27728 for issm/trunk-jpl/src/c/classes/Cfsurfacesquaretransient.cpp

Timestamp:

05/04/23 17:45:09 (23 months ago)

Author:

Mathieu Morlighem

Message:

NEW: moving J to cost function itself instead of being weirdly handled

File:

• issm/trunk-jpl/src/c/classes/Cfsurfacesquaretransient.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Cfsurfacesquaretransient.cpp

@@ -159 +159 @@
         /*Check that we have not yet calculated this cost function*/
         if(this->passedflags[pos]){
-                return 0.;
-                //return this->J; //FIXME
+                return this->J;
         }
 
@@ -172 +171 @@
         /*Sum across partition*/
         IssmDouble J_sum;
-        ISSM_MPI_Allreduce( (void*)&J_part,(void*)&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+        ISSM_MPI_Allreduce((void*)&J_part,(void*)&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
         ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
 
@@ -180 +179 @@
 
         /*Return full cost function this far*/
-        //return this->J; //FIXME
-        return J_sum;
+        return this->J;
 }/*}}}*/
 IssmDouble Cfsurfacesquaretransient::Cfsurfacesquaretransient_Calculation(Element* element, int model_enum){/*{{{*/