Changeset 823

Timestamp:

06/05/09 15:14:47 (16 years ago)

Author:

Eric.Larour

Message:

New transient 2d solution in parallel

Location:

issm/trunk/src

Files:

• c/DataSet/DataSet.cpp (modified) (1 diff)
• c/DataSet/DataSet.h (modified) (1 diff)
• c/Makefile.am (modified) (3 diffs)
• c/ModelProcessorx/Prognostic/CreateParametersPrognostic.cpp (modified) (3 diffs)
• c/objects/Result.cpp (modified) (1 diff)
• c/parallel/SpawnCore.cpp (modified) (1 diff)
• c/parallel/parallel.h (modified) (1 diff)
• c/parallel/transient.cpp (added)
• c/parallel/transient_core.cpp (added)
• c/parallel/transient_core_2d.cpp (added)
• c/parallel/transient_core_3d.cpp (added)
• m/solutions/cielo/transient2d.m (modified) (1 diff)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -338 +338 @@
 }
 
+int   DataSet::FindResult(Vec* presult,char* name){
+
+        /*Go through a dataset, and find a Result* object 
+         *whith result name is "name" : */
+        
+        vector<Object*>::iterator object;
+        Result* result=NULL;
+
+        int found=0;
+
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+
+                /*Find param type objects: */
+                if((*object)->Enum()==ResultEnum()){
+
+                        /*Ok, this object is a result,recover it and ask which name it has: */
+                        result=(Result*)(*object);
+
+                        if (strcmp(result->GetFieldName(),name)==0){
+                                /*Ok, this is the one! Recover the value of this result: */
+                                result->GetField(presult);
+                                found=1;
+                                break;
+                        }
+                }
+        }
+        return found;
+}
+
 int   DataSet::FindResult(void* pvalue, char* name){
 

issm/trunk/src/c/DataSet/DataSet.h

@@ -44 +44 @@
                 int   Size();
                 int   FindParam(void* pvalue, char* name);
+                int   FindResult(Vec* presult,char* name);
                 Object* FindParamObject(char* name);
                 void  NodeRank(int* ranks);

issm/trunk/src/c/Makefile.am

@@ -557 +557 @@
                                         ./parallel/ProcessResults.cpp\
                                         ./parallel/prognostic_core.cpp\
+                                        ./parallel/transient_core.cpp\
+                                        ./parallel/transient_core_2d.cpp\
+                                        ./parallel/transient_core_3d.cpp\
                                         ./parallel/qmu.cpp\
                                         ./parallel/DakotaResponses.cpp\
@@ -567 +570 @@
 bin_PROGRAMS = 
 else 
-bin_PROGRAMS = diagnostic.exe  control.exe thermal.exe prognostic.exe
+bin_PROGRAMS = diagnostic.exe  control.exe thermal.exe prognostic.exe transient.exe
 endif
 
@@ -584 +587 @@
 prognostic_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
 
+transient_exe_SOURCES = parallel/transient.cpp
+transient_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
+

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateParametersPrognostic.cpp

@@ -26 +26 @@
         double* pressure=NULL;
         double* thickness=NULL;
+        double* surface=NULL;
+        double* bed=NULL;
         double* accumulation=NULL;
         double* melting=NULL;
@@ -68 +70 @@
         xfree((void**)&thickness);
 
+        /*Get surface: */
+        ModelFetchData((void**)&surface,NULL,NULL,model_handle,"surface","Matrix","Mat");
+        
+        count++;
+        param= new Param(count,"s_g",DOUBLEVEC);
+        if(surface) param->SetDoubleVec(surface,model->numberofnodes,1);
+        else param->SetDoubleVec(surface,0,0);
+        parameters->AddObject(param);
+
+        /*Free surface: */
+        xfree((void**)&surface);
+
+        /*Get bed: */
+        ModelFetchData((void**)&bed,NULL,NULL,model_handle,"bed","Matrix","Mat");
+        
+        count++;
+        param= new Param(count,"b_g",DOUBLEVEC);
+        if(bed) param->SetDoubleVec(bed,model->numberofnodes,1);
+        else param->SetDoubleVec(bed,0,0);
+        parameters->AddObject(param);
+
+        /*Free bed: */
+        xfree((void**)&bed);
+
+
         /*Get melting: */
         ModelFetchData((void**)&melting,NULL,NULL,model_handle,"melting","Matrix","Mat");
@@ -93 +120 @@
 
 
-
-
         /*Assign output pointer: */
         *pparameters=parameters;

issm/trunk/src/c/objects/Result.cpp

@@ -196 +196 @@
 
 void  Result::GetField(Vec* pfield){
-        *pfield=field;
+
+        VecDuplicatePatch(pfield,field);
+
 }
                 
 void  Result::GetField(double** pfield){
-        *pfield=dfield;
+        *pfield=(double*)xmalloc(size*sizeof(double));
+        memcpy(*pfield,dfield,size*sizeof(double));
 }
 

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

@@ -144 +144 @@
 
                 if(debug)_printf_("Starting transient core\n");
-                throw ErrorException(__FUNCT__,"not supported yet!");
+                transient_core(results,femmodels,inputs);
 
         }

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

@@ -19 +19 @@
 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_linear(Vec* ppg,FemModel* fem,ParameterInputs* inputs,int  analysis_type,int sub_analysis_type);
+
+void transient_core(DataSet* results,FemModel* fems, ParameterInputs* inputs);
+void transient_core_2d(DataSet* results,FemModel* fems, ParameterInputs* inputs);
+void transient_core_3d(DataSet* results,FemModel* fems, ParameterInputs* inputs);
 
 //int GradJOrth(WorkspaceParams* workspaceparams);

issm/trunk/src/m/solutions/cielo/transient2d.m

@@ -33 +33 @@
 solution.p_g=[];
 solution.h_g=m_p.parameters.h_g;
-solution.s_g=md.surface;
-solution.b_g=md.bed;
+solution.s_g=m_p.parameters.s_g;
+solution.b_g=m_p.parameters.b_g;
 
 %initialize inputs