Changeset 5414

Timestamp:

08/19/10 11:22:37 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed misfit 3

Location:

issm/trunk/src/c

Files:

• modules/MaxAbsVxx/MaxAbsVxx.cpp (modified) (1 diff)
• modules/MaxAbsVyx/MaxAbsVyx.cpp (modified) (1 diff)
• modules/MaxAbsVzx/MaxAbsVzx.cpp (modified) (1 diff)
• modules/MaxVelx/MaxVelx.cpp (modified) (1 diff)
• modules/MaxVxx/MaxVxx.cpp (modified) (1 diff)
• modules/MaxVyx/MaxVyx.cpp (modified) (1 diff)
• modules/MaxVzx/MaxVzx.cpp (modified) (1 diff)
• modules/MinVelx/MinVelx.cpp (modified) (1 diff)
• modules/MinVxx/MinVxx.cpp (modified) (1 diff)
• modules/MinVyx/MinVyx.cpp (modified) (1 diff)
• modules/MinVzx/MinVzx.cpp (modified) (1 diff)
• modules/SurfaceAreax/SurfaceAreax.cpp (modified) (2 diffs)
• modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)
• solutions/adjointbalancedthickness_core.cpp (modified) (1 diff)
• solutions/adjointdiagnostic_core.cpp (modified) (3 diffs)

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MaxAbsVxx( double* pmaxabsvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MaxAbsVyx( double* pmaxabsvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MaxAbsVzx( double* pmaxabsvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MaxVelx( double* pmaxvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MaxVxx( double* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MaxVyx( double* pmaxvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MaxVzx( double* pmaxvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MinVelx( double* pminvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MinVxx( double* pminvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MinVyx( double* pminvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../SurfaceAreax/SurfaceAreax.h"
 
 void MinVzx( double* pminvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){

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

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h"
 
 void SurfaceAreax( double* pS, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
@@ -31 +32 @@
         S=S_sum;
 
+        /*add surface area to element inputs:*/
+        InputUpdateFromConstantx(elements,nodes,vertices,loads,materials,parameters,S,SurfaceAreaEnum);
+
         /*Assign output pointers: */
-        *pS=S;
+        if(pS) *pS=S;
 }

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

@@ -14 +14 @@
 
         /*Intermediary*/
-        double S;
         int i;
         Element* element=NULL;
@@ -22 +21 @@
         double J_sum;
 
-        /*Compute surface area: */
-        SurfaceAreax(&S,elements,nodes,vertices, loads,materials,parameters);
-
-        /*add surface area to elements :*/
-        for(i=0;i<elements->Size();i++){
-                Element* element=(Element*)elements->GetObjectByOffset(i);
-                element->InputUpdateFromVector(&S,SurfaceAreaEnum,ConstantEnum);
-        }
+        /*Compute surface area and add to elements inputs */
+        SurfaceAreax(NULL,elements,nodes,vertices, loads,materials,parameters);
 
         /*Compute Misfit: */

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -6136 +6136 @@
                                 name==AccumulationRateEnum ||
                                 name==GeothermalFluxEnum ||
+                                name==SurfaceAreaEnum||
                                 name==PressureEnum ||
                                 name==VxEnum ||

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -7184 +7184 @@
                                 name==MeltingRateEnum ||
                                 name==AccumulationRateEnum ||
+                                name==SurfaceAreaEnum||
                                 name==ControlParameterEnum ||
                                 name==VxEnum ||

issm/trunk/src/c/solutions/adjointbalancedthickness_core.cpp

@@ -24 +24 @@
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
-        /*set analysis type to compute velocity: */
+        /*compute thickness */
         _printf_("%s\n","      computing thickness");
         femmodel->SetCurrentConfiguration(BalancedthicknessAnalysisEnum);
         solver_linear(femmodel);
 
-        /*Update inputs using adjoint solution, and same type of setup as diagnostic solution: */
+        /*Call SurfaceAreax, because some it might be needed by PVector*/
+        SurfaceAreax(NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+
+        /*compute adjoint*/
         _printf_("%s\n","      computing adjoint");
         femmodel->SetCurrentConfiguration(BalancedthicknessAnalysisEnum,AdjointBalancedthicknessAnalysisEnum);
         solver_adjoint_linear(femmodel);
         
+        /*Save results*/
         if(solution_type==AdjointSolutionEnum && !control_analysis){
                 if(verbose)_printf_("saving results:\n");

issm/trunk/src/c/solutions/adjointdiagnostic_core.cpp

@@ -27 +27 @@
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
-        /*set analysis type to compute velocity: */
+        /*Compute velocities*/
         _printf_("%s\n","      computing velocities");
         if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum);
@@ -33 +33 @@
         solver_diagnostic_nonlinear(femmodel,conserve_loads); 
 
-        /*Update inputs using adjoint solution, and same type of setup as diagnostic solution: */
+        /*Call SurfaceAreax, because some it might be needed by PVector*/
+        SurfaceAreax(NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+
+        /*Compute adjoint*/
         _printf_("%s\n","      computing adjoint");
         if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum,AdjointStokesAnalysisEnum);
@@ -39 +42 @@
         solver_adjoint_linear(femmodel);
         
+        /*Save results*/
         if(solution_type==AdjointSolutionEnum && !control_analysis){
                 if(verbose)_printf_("saving results:\n");