Changeset 25558

Timestamp:

09/11/20 08:03:08 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing Basile's commit

Location:

issm/trunk-jpl/src/c/cores

Files:

• controladm1qn3_core.cpp (modified) (3 diffs)
• controlvalidation_core.cpp (modified) (2 diffs)

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

@@ -281 +281 @@
         codi_global.output_indices.clear();
         #endif
+        int i=-1;
         for(Object* & object:dependent_objects->objects){
-                DependentObject* dep=(DependentObject*)object;
+                i++;
+                DependentObject* dep=xDynamicCast<DependentObject*>(object);
                 if(solution_type==TransientSolutionEnum) output_value = dep->GetValue();
                 if(solution_type!=TransientSolutionEnum) dep->Responsex(&output_value,femmodel);
@@ -474 +476 @@
 
         /*Intermediaries*/
-        long         omode;
-        double           f;
-        double           dxmin,gttol;
-        int          maxsteps,maxiter;
-        int          intn,num_controls,num_cost_functions,solution_type;
-        double*      scaling_factors = NULL;
-        double      *X  = NULL;
-        double      *G  = NULL;
-        int*                    N       = NULL;
-   int*                 M       = NULL;
-        int* control_enum;
+        long    omode;
+        double  f,dxmin,gttol;
+        int     maxsteps,maxiter;
+        int     intn ,num_controls,num_cost_functions,solution_type;
+        double *scaling_factors = NULL;
+        double *X               = NULL;
+        double *G               = NULL;
+        int    *N               = NULL;
+        int    *M               = NULL;
+        int    *control_enum;
 
         /*Recover some parameters*/
@@ -631 +632 @@
                 femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,mystruct.Jlist,(*mystruct.i),mystruct.N,0,0));
 
-        femmodel->OutputControlsx(&femmodel->results);
+                femmodel->OutputControlsx(&femmodel->results);
         }
 

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

@@ -217 +217 @@
         dependents=xNew<IssmPDouble>(num_dependents);
         codi_global.output_indices.clear();
+        int i=-1;
         for(Object* & object:dependent_objects->objects){
-                DependentObject* dep=(DependentObject*)object
+                DependentObject* dep=xDynamicCast<DependentObject*>(object);
+                i++;
                 if(solution_type==TransientSolutionEnum){
                         output_value = dep->GetValue();
@@ -293 +295 @@
                 j=0.;
                 for(Object* & object:dependent_objects->objects){
-                        DependentObject* dep=(DependentObject*)object
+                        DependentObject* dep=xDynamicCast<DependentObject*>(object);
                         if(solution_type==TransientSolutionEnum){
                                 output_value = dep->GetValue();