Changeset 25592

Timestamp:

09/24/20 13:32:38 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: now use dependent objects, computed at the end of the run ONLY, to get gradient

File:

• issm/trunk-jpl/src/c/cores/transient_core.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -333 +333 @@
 
                 /*Go through our dependent variables, and compute the response:*/
-                DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
-                for(Object* & object:dependent_objects->objects){
-                        DependentObject* dep=(DependentObject*)object;
-                        dep->Responsex(&output_value,femmodel);
-                        dep->AddValue(output_value);
+                if(finaltime==time){
+                        DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
+                        for(Object* & object:dependent_objects->objects){
+                                DependentObject* dep=(DependentObject*)object;
+                                dep->Responsex(&output_value,femmodel);
+                                dep->AddValue(output_value);
+                        }
                 }
 
@@ -378 +380 @@
 
         IssmDouble J = 0.;
-        if(0){
-                DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
-                for(Object* & object:dependent_objects->objects){
-                        DependentObject* dep=(DependentObject*)object;
-                        J += dep->GetValue();
-                }
-        }
-        else{
-                femmodel->IceVolumeAboveFloatationx(&J,false);
+        DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
+        for(Object* & object:dependent_objects->objects){
+                DependentObject* dep=(DependentObject*)object;
+                J += dep->GetValue();
         }
         tape_codi.registerOutput(J);
@@ -435 +432 @@
                         transient_step(femmodel);
 
+                        /*Go through our dependent variables, and compute the response:*/
+                        if(thistime==finaltime){
+                                DataSet* dependent_objects=((DataSetParam*)femmodel->parameters->FindParamObject(AutodiffDependentObjectsEnum))->value;
+                                for(Object* & object:dependent_objects->objects){
+                                        DependentObject* dep=(DependentObject*)object;
+                                        dep->Responsex(&output_value,femmodel);
+                                        dep->AddValue(output_value);
+                                }
+                        }
+
                         /*First and last segment need special treatment*/
                         if(thisstep==finalstep) break;
@@ -460 +467 @@
                 for(int i=0; i<Xsize;   i++) Xb[i] += X[i].gradient();
         }
+        /*Clear tape*/
+        tape_codi.reset();
 
         /*Broadcast gradient to other ranks (make sure to sum all gradients)*/