Changeset 4451

Timestamp:

07/07/10 16:52:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed compilation (Almost)

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/DakotaResponsesx/DakotaResponsesx.cpp (modified) (2 diffs)

issm/trunk/src/c/Makefile.am

@@ -1077 +1077 @@
                                         ./modules/Qmux/Qmux.h\
                                         ./modules/Qmux/Qmux.cpp\
-                                        ./modules/Qmux/DakotaResponses.cpp\
                                         ./modules/Qmux/DakotaMPI_Bcast.cpp\
                                         ./modules/Qmux/DakotaFree.cpp\

issm/trunk/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp

@@ -35 +35 @@
 
                 if(strcmp(response_descriptor,"min_vel")==0){
-                        MinVelx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MinVelx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"max_vel")==0){
-                        MaxVelx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MaxVelx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"min_vx")==0){
-                        MinVxx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MinVxx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"max_vx")==0){
-                        MaxVxx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MaxVxx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"max_abs_vx")==0){
-                        MaxAbsVxx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MaxAbsVxx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"min_vy")==0){
-                        MinVyx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MinVyx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"max_vy")==0){
-                        MaxVyx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MaxVyx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"max_abs_vy")==0){
-                        MaxAbsVyx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MaxAbsVyx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"min_vz")==0){
-                        MinVzx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MinVzx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"max_vz")==0){
-                        MaxVzx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MaxVzx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"max_abs_vz")==0){
-                        MaxAbsVzx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        MaxAbsVzx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"misfit")==0){
-                        Misfitx( &femmodel_response, femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters);
+                        Misfitx( &femmodel_response, elements,nodes, vertices, loads, materials, parameters);
                 }
                 else if(strcmp(response_descriptor,"mass_flux")==0){
@@ -76 +76 @@
                         
                         /*retrieve qmu_mass_flux_segments: */
-                        femmodel->parameters->FindParam(&segments,&num_segments,&dummy,QmuMassFluxSegmentsEnum);
+                        parameters->FindParam(&segments,&num_segments,&dummy,QmuMassFluxSegmentsEnum);
 
                         /*call mass flux module: */
-                        MassFluxx(&femmodel_response,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,segments,num_segments);
+                        MassFluxx(&femmodel_response,elements,nodes,vertices,loads,materials,parameters,segments,num_segments);
 
                         /*Free ressources:*/