Changeset 16219

Timestamp:

09/20/13 16:10:05 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying InputDuplicatex prototype

Location:

issm/trunk-jpl/src/c

Files:

• analyses/enthalpy_core.cpp (modified) (1 diff)
• analyses/hydrology_core.cpp (modified) (2 diffs)
• analyses/masstransport_core.cpp (modified) (1 diff)
• analyses/stressbalance_core.cpp (modified) (1 diff)
• analyses/thermal_core.cpp (modified) (1 diff)
• analyses/transient_core.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• modules/InputDuplicatex/InputDuplicatex.cpp (modified) (1 diff)
• modules/InputDuplicatex/InputDuplicatex.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/enthalpy_core.cpp ¶

@@ -23 +23 @@
 
         /*transfer enthalpy to enthalpy picard for the next step: */
-        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,EnthalpyPicardEnum);
+        InputDuplicatex(femmodel,EnthalpyEnum,EnthalpyPicardEnum);
 
         if(save_results){

issm/trunk-jpl/src/c/analyses/hydrology_core.cpp ¶

@@ -64 +64 @@
                         /*transfer water column thickness to old water column thickness: */
 
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum,WaterColumnOldEnum);
+                        InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum);
 
                         if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
@@ -79 +79 @@
 
                 else if (hydrology_model==HydrologydcEnum){
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum,SedimentHeadOldEnum);
+                        InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum);
                         femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
                         if (isefficientlayer){
-                                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EplHeadEnum,EplHeadOldEnum);
+                                InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum);
                         }
 

issm/trunk-jpl/src/c/analyses/masstransport_core.cpp ¶

@@ -36 +36 @@
         /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
         if(dakota_analysis && solution_type==MasstransportSolutionEnum){
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuSurfaceEnum,SurfaceEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuThicknessEnum,ThicknessEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuBedEnum,BedEnum);
+                InputDuplicatex(femmodel,QmuSurfaceEnum,SurfaceEnum);
+                InputDuplicatex(femmodel,QmuThicknessEnum,ThicknessEnum);
+                InputDuplicatex(femmodel,QmuBedEnum,BedEnum);
         }
 

issm/trunk-jpl/src/c/analyses/stressbalance_core.cpp ¶

@@ -39 +39 @@
         /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
         if(dakota_analysis && solution_type==StressbalanceSolutionEnum){
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxEnum,VxEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyEnum,VyEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVzEnum,VzEnum);
-                if(isFS) InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuPressureEnum,PressureEnum);
+                InputDuplicatex(femmodel,QmuVxEnum,VxEnum);
+                InputDuplicatex(femmodel,QmuVyEnum,VyEnum);
+                InputDuplicatex(femmodel,QmuVzEnum,VzEnum);
+                if(isFS) InputDuplicatex(femmodel,QmuPressureEnum,PressureEnum);
         }
 

issm/trunk-jpl/src/c/analyses/thermal_core.cpp ¶

@@ -23 +23 @@
 
         if(dakota_analysis && solution_type!=TransientSolutionEnum){
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxMeshEnum,VxMeshEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyMeshEnum,VyMeshEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVzMeshEnum,VzMeshEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuTemperatureEnum,TemperatureEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
-                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMaterialsRheologyBEnum,MaterialsRheologyBEnum);
+                InputDuplicatex(femmodel,QmuVxMeshEnum,VxMeshEnum);
+                InputDuplicatex(femmodel,QmuVyMeshEnum,VyMeshEnum);
+                InputDuplicatex(femmodel,QmuVzMeshEnum,VzMeshEnum);
+                InputDuplicatex(femmodel,QmuTemperatureEnum,TemperatureEnum);
+                InputDuplicatex(femmodel,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
+                InputDuplicatex(femmodel,QmuMaterialsRheologyBEnum,MaterialsRheologyBEnum);
                 femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
                 ResetConstraintsx(femmodel);

issm/trunk-jpl/src/c/analyses/transient_core.cpp ¶

@@ -61 +61 @@
         if(dakota_analysis){
                 if(isstressbalance){
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxEnum,VxEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyEnum,VyEnum);
+                        InputDuplicatex(femmodel,QmuVxEnum,VxEnum);
+                        InputDuplicatex(femmodel,QmuVyEnum,VyEnum);
                         if(dim==3){
-                                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVzEnum,VzEnum);
-                                if(isFS)InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuPressureEnum,PressureEnum);
+                                InputDuplicatex(femmodel,QmuVzEnum,VzEnum);
+                                if(isFS)InputDuplicatex(femmodel,QmuPressureEnum,PressureEnum);
                         }
                 }
                 if(ismasstransport || isgroundingline){
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuThicknessEnum,ThicknessEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuSurfaceEnum,SurfaceEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuBedEnum,BedEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMaskIceLevelsetEnum,MaskIceLevelsetEnum);
+                        InputDuplicatex(femmodel,QmuThicknessEnum,ThicknessEnum);
+                        InputDuplicatex(femmodel,QmuSurfaceEnum,SurfaceEnum);
+                        InputDuplicatex(femmodel,QmuBedEnum,BedEnum);
+                        InputDuplicatex(femmodel,QmuMaskIceLevelsetEnum,MaskIceLevelsetEnum);
                 }
-                if(isgroundingline) InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMaskGroundediceLevelsetEnum,MaskGroundediceLevelsetEnum);
-                if(dim==2)InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
+                if(isgroundingline) InputDuplicatex(femmodel,QmuMaskGroundediceLevelsetEnum,MaskGroundediceLevelsetEnum);
+                if(dim==2)InputDuplicatex(femmodel,QmuMaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
                 if(isthermal && dim==3){
                         //Update Vertex Position after updating Thickness and Bed
                         femmodel->SetCurrentConfiguration(MasstransportAnalysisEnum);
                         femmodel->UpdateVertexPositionsx();
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxMeshEnum,VxMeshEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyMeshEnum,VyMeshEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVzMeshEnum,VzMeshEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuTemperatureEnum,TemperatureEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
-                        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuMaterialsRheologyBEnum,MaterialsRheologyBEnum);
+                        InputDuplicatex(femmodel,QmuVxMeshEnum,VxMeshEnum);
+                        InputDuplicatex(femmodel,QmuVyMeshEnum,VyMeshEnum);
+                        InputDuplicatex(femmodel,QmuVzMeshEnum,VzMeshEnum);
+                        InputDuplicatex(femmodel,QmuTemperatureEnum,TemperatureEnum);
+                        InputDuplicatex(femmodel,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
+                        InputDuplicatex(femmodel,QmuMaterialsRheologyBEnum,MaterialsRheologyBEnum);
                         //Reset Thermal Constraints
                         femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp ¶

@@ -2426 +2426 @@
 
         /*Intermediaries*/
-        int        i;
-        IssmDouble nodeinputs[3];
-        IssmDouble yts;
-        int        progstabilization,balancestabilization;
-        int        fe_ssa;
-        bool       dakota_analysis;
-        int        numnodes;
-        int*       tria_node_ids = NULL;
+        int  numnodes;
+        int* tria_node_ids = NULL;
 
         /*Checks if debuging*/
         _assert_(iomodel->elements);
-
-        /*Fetch parameters: */
-        iomodel->Constant(&yts,ConstantsYtsEnum);
-        iomodel->Constant(&progstabilization,MasstransportStabilizationEnum);
-        iomodel->Constant(&balancestabilization,BalancethicknessStabilizationEnum);
-        iomodel->Constant(&fe_ssa,FlowequationFeSSAEnum);
-        iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum);
 
         /*Recover element type*/
@@ -2492 +2479 @@
         /*Fill with IoModel*/
         this->InputUpdateFromIoModel(index,iomodel);
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp ¶

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 
-void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int original_enum, int new_enum){
+void InputDuplicatex(FemModel* femmodel,int original_enum, int new_enum){
 
         /*Go through elemnets, and ask to reinitialie the input: */
-        int      i;
-        for(i=0;i<elements->Size();i++){
-                Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+        for(int i=0;i<femmodel->elements->Size();i++){
+                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->InputDuplicate(original_enum,new_enum);
         }
-        for(i=0;i<materials->Size();i++){
-                Material* material=(Material*)materials->GetObjectByOffset(i);
+        for(int i=0;i<femmodel->materials->Size();i++){
+                Material* material=(Material*)femmodel->materials->GetObjectByOffset(i);
                 material->InputDuplicate(original_enum,new_enum);
         }

issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.h ¶

@@ -9 +9 @@
 
 /* local prototypes: */
-void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int reinitialized_enum, int original_enum);
+void InputDuplicatex(FemModel* femmodel,int reinitialized_enum, int original_enum);
 
 #endif  /* _INPUTDUPLICATEX_H */