Changeset 1854

Timestamp:

08/24/09 18:25:11 (16 years ago)

Author:

Eric.Larour

Message:

Some merging difficulties

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (7 diffs)
• ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (5 diffs)
• parallel/ControlInitialization.cpp (modified) (1 diff)
• parallel/objectivefunctionC.cpp (modified) (1 diff)
• parallel/parallel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -21 +21 @@
                                         ./objects/Element.h\
                                         ./objects/Element.cpp\
+                                        ./objects/Model.h\
+                                        ./objects/Model.cpp\
                                         ./objects/Material.h\
                                         ./objects/Material.cpp\
@@ -167 +169 @@
                                         ./io/ParallelFetchScalar.cpp\
                                         ./io/ParallelFetchString.cpp\
-                                        ./io/ModelFetchData.cpp\
+                                        ./io/IoModelFetchData.cpp\
                                         ./io/WriteNodeSets.cpp\
                                         ./io/WriteParams.cpp\
@@ -177 +179 @@
                                         ./EnumDefinitions/EnumDefinitions.cpp\
                                         ./EnumDefinitions/AnalysisTypeAsEnum.cpp\
-                                        ./ModelProcessorx/Model.h\
-                                        ./ModelProcessorx/Model.cpp\
+                                        ./ModelProcessorx/IoModel.h\
+                                        ./ModelProcessorx/IoModel.cpp\
                                         ./ModelProcessorx/CreateDataSets.cpp\
                                         ./ModelProcessorx/CreateParameters.cpp\
@@ -314 +316 @@
                                         ./objects/Element.h\
                                         ./objects/Element.cpp\
+                                        ./objects/Model.h\
+                                        ./objects/Model.cpp\
                                         ./objects/Material.h\
                                         ./objects/Material.cpp\
@@ -458 +462 @@
                                         ./io/ParallelFetchScalar.cpp\
                                         ./io/ParallelFetchString.cpp\
-                                        ./io/ModelFetchData.cpp\
+                                        ./io/IoModelFetchData.cpp\
                                         ./io/WriteNodeSets.cpp\
                                         ./io/WriteParams.cpp\
@@ -468 +472 @@
                                         ./EnumDefinitions/EnumDefinitions.cpp\
                                         ./EnumDefinitions/AnalysisTypeAsEnum.cpp\
-                                        ./ModelProcessorx/Model.h\
-                                        ./ModelProcessorx/Model.cpp\
+                                        ./ModelProcessorx/IoModel.h\
+                                        ./ModelProcessorx/IoModel.cpp\
                                         ./ModelProcessorx/CreateDataSets.cpp\
                                         ./ModelProcessorx/CreateParameters.cpp\
@@ -601 +605 @@
                                         ./parallel/transient_core_3d.cpp\
                                         ./parallel/thermalstatic_core.cpp\
-                                        ./parallel/OutputResults.cpp\
-                                        ./parallel/OutputControl.cpp
+                                        ./parallel/OutputResults.cpp
 
 libpISSM_a_CXXFLAGS = -fPIC -D_PARALLEL_   -D_C_

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -211 +211 @@
                 ;
         /*numrifts: */
-        ModelFetchData((void**)&model->riftinfo,&model->numrifts,NULL,model_handle,"riftinfo","Matrix","Mat");
+        IoModelFetchData((void**)&iomodel->riftinfo,&iomodel->numrifts,NULL,iomodel_handle,"riftinfo","Matrix","Mat");
         count++;
         param= new Param(count,"numrifts",INTEGER);
-        param->SetInteger(model->numrifts);
-        parameters->AddObject(param);
-        xfree((void**)&model->riftinfo); 
+        param->SetInteger(iomodel->numrifts);
+        parameters->AddObject(param);
+        xfree((void**)&iomodel->riftinfo); 
         
         /*All our datasets are already ordered by ids. Set presort flag so that later on, when sorting is requested on these 

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -55 +55 @@
         double riftfront_friction;
         double riftfront_fraction;
+        double riftfront_fractionincrement;
         bool   riftfront_shelf;
         double riftfront_penalty_offset;
@@ -68 +69 @@
         double friction;
         double fraction;
+        double fractionincrement;
         
         /*Create loads: */
@@ -186 +188 @@
                         friction=*(iomodel->riftinfo+RIFTINFOSIZE*i+8);
                         fraction=*(iomodel->riftinfo+RIFTINFOSIZE*i+9);
-                        fractionincrement=*(model->riftinfo+RIFTINFOSIZE*i+10);
+                        fractionincrement=*(iomodel->riftinfo+RIFTINFOSIZE*i+10);
         
                         strcpy(riftfront_type,"2d");
@@ -211 +213 @@
                         riftfront_fraction=fraction;
                         riftfront_fractionincrement=fractionincrement;
-                        riftfront_shelf=(bool)model->gridoniceshelf[grid1-1];
+                        riftfront_shelf=(bool)iomodel->gridoniceshelf[grid1-1];
 
                         riftfront_penalty_offset=iomodel->penalty_offset;
@@ -220 +222 @@
                         riftfront_prestable=0;
                         
-                        riftfront=new Riftfront(riftfront_type,riftfront_id, riftfront_node_ids, riftfront_mparid, riftfront_h,riftfront_b,riftfront_s,riftfront_normal,riftfront_length,riftfront_fill,riftfront_friction, riftfront_fraction, riftfront_penalty_offset, riftfront_penalty_lock, riftfront_active,riftfront_counter,riftfront_prestable,riftfront_shelf);
+                        riftfront=new Riftfront(riftfront_type,riftfront_id, riftfront_node_ids, riftfront_mparid, riftfront_h,riftfront_b,riftfront_s,riftfront_normal,riftfront_length,riftfront_fill,riftfront_friction, riftfront_fraction, riftfront_fractionincrement, riftfront_penalty_offset, riftfront_penalty_lock, riftfront_active,riftfront_counter,riftfront_prestable,riftfront_shelf);
 
                         loads->AddObject(riftfront);

issm/trunk/src/c/parallel/ControlInitialization.cpp

@@ -97 +97 @@
         //horizontal velocity
         if(debug)_printf_("%s\n"," computing horizontal velocities...");
-        diagnostic_core_nonlinear(&ug,NULL,NULL,fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
         if(debug)_printf_("%s\n"," extruding horizontal velocities...");
         VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh->loads,fem_dh-> materials,"velocity",1);

issm/trunk/src/c/parallel/objectivefunctionC.cpp

@@ -90 +90 @@
         if(!thermalstatic){
                 //Run diagnostic with updated parameters.
-                diagnostic_core_nonlinear(&u_g,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
+                diagnostic_core_nonlinear(&u_g,NULL,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
                 VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
         }

issm/trunk/src/c/parallel/parallel.h

@@ -20 +20 @@
 void thermalstatic_core(DataSet* results,Model* model, ParameterInputs* inputs);
 
-void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
+void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, DataSet* loads, FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
 void diagnostic_core_linear(Vec* ppg,FemModel* fem,ParameterInputs* inputs,int  analysis_type,int sub_analysis_type);
 void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,DataSet* parameters);