Changeset 19344

Timestamp:

05/07/15 19:37:40 (10 years ago)

Author:

Eric.Larour

Message:

CHG: add results at step 0,0 instead of 1,0 (which would imply a transient)

Location:

issm/trunk-jpl/src/c/cores

Files:

• ad_core.cpp (modified) (4 diffs)
• control_core.cpp (modified) (1 diff)
• controlad_core.cpp (modified) (1 diff)
• controlvalidation_core.cpp (modified) (1 diff)

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

@@ -151 +151 @@
 
                                 /*add to results*/
-                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,jacTimesTangentDir,num_dependents,1,1,0.0));
+                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,jacTimesTangentDir,num_dependents,1,0,0.0));
 
                                 /*free resources :*/
@@ -223 +223 @@
 
                                 /*add to results: */
-                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,*jacTimesSeed,num_dependents*tangentDirNum,1,1,0.0));
+                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,*jacTimesSeed,num_dependents*tangentDirNum,1,0,0.0));
 
                                 /*Free resources: */
@@ -260 +260 @@
 
                                 /*add to results*/
-                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,weightVectorTimesJac,num_independents,1,1,0.0));
+                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,weightVectorTimesJac,num_independents,1,0,0.0));
 
                                 /*free resources :*/
@@ -322 +322 @@
 
                                 /*add to results: */
-                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,*weightsTimesJac,weightNum*num_independents,1,1,0.0));
+                                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,*weightsTimesJac,weightNum*num_independents,1,0,0.0));
 
                                 /*Free resources: */

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

@@ -100 +100 @@
                 IssmPDouble* J_passive=xNew<IssmPDouble>(nsteps);
                 for(int i=0;i<nsteps;i++) J_passive[i]=reCast<IssmPDouble>(J[i]);
-                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J_passive,nsteps,1,1,0));
+                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J_passive,nsteps,1,0,0));
                 xDelete<IssmPDouble>(J_passive);
                 #else
-                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J,nsteps,1,1,0));
+                femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J,nsteps,1,0,0));
                 #endif
         }

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

@@ -107 +107 @@
         
         /*Save results:*/
-        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,G,n,1,1,0.0));
-        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffXpEnum,X,intn,1,1,0.0));
+        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffJacobianEnum,G,n,1,0,0.0));
+        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,AutodiffXpEnum,X,intn,1,0,0.0));
 
         /*Clean-up and return*/

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

@@ -91 +91 @@
         IssmPDouble* J_passive=xNew<IssmPDouble>(2*num);
         for(int i=0;i<2*num;i++) J_passive[i]=reCast<IssmPDouble>(output[i]);
-        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J_passive,num,2,1,0));
+        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J_passive,num,2,0,0));
         xDelete<IssmPDouble>(J_passive);
         #else
-        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,output,num,2,1,0));
+        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,output,num,2,0,0));
         #endif
         ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);