Changeset 654

Timestamp:

05/29/09 16:27:36 (16 years ago)

Author:

Mathieu Morlighem

Message:

updated thermal_core_nonlinear : compute K_gg_nopenalty only once (to be tested)

Location:

issm/trunk/src/c/parallel

Files:

• thermal.cpp (modified) (1 diff)
• thermal_core.cpp (modified) (1 diff)
• thermal_core_nonlinear.cpp (modified) (4 diffs)

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

@@ -89 +89 @@
         param=(Param*)femmodels[1].parameters->FindParamObject("p_g");
         femmodels[1].parameters->DeleteObject((Object*)param);
-
         
         _printf_("call computational core:\n");

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

@@ -26 +26 @@
 
         /*solutions vectors: */
-        Vec* t_g=NULL;
-        Vec* m_g=NULL;
+        Vec*    t_g=NULL;
+        Vec*    m_g=NULL;
         double* time=NULL;
 
         /*flags: */
-        int debug=0;
-        int numberofdofspernode;
-        int numberofnodes;
-        int nsteps;
+        int     debug=0;
+        int     numberofdofspernode;
+        int     numberofnodes;
+        int     nsteps;
         double  dt;
         double  ndt;

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

@@ -20 +20 @@
         /*intermediary: */
         Mat Kgg=NULL;
+        Mat Kgg_nopenalty=NULL;
         Mat Kff=NULL;
         Mat Kfs=NULL;
         Vec pg=NULL;
+        Vec pg_nopenalty=NULL;
         Vec pf=NULL;
 
@@ -36 +38 @@
         char* solver_string=NULL;
         int debug=0;
+        int lowmem=0;
 
         /*Recover parameters: */
@@ -45 +48 @@
         fem->parameters->FindParam((void*)&solver_string,"solverstring");
         fem->parameters->FindParam((void*)&debug,"debug");
+        fem->parameters->FindParam((void*)&lowmem,"lowmem");
         fem->parameters->FindParam((void*)&min_thermal_constraints,"min_thermal_constraints");
 
@@ -57 +61 @@
 
                 //*Generate system matrices
-                SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 
-                //apply penalties
-                PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,inputs,analysis_type,sub_analysis_type); 
+                if (!lowmem){
+
+                        /*Compute Kgg_nopenalty and pg_nopenalty once for all: */
+                        if (count==1){
+                                SystemMatricesx(&Kgg_nopenalty, &pg_nopenalty,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 
+                        }
+
+                        /*Copy K_gg_nopenalty into Kgg, same for pg: */
+                        Kgg=(Mat)xmalloc(sizeof(Mat));
+                        MatDuplicate(Kgg_nopenalty,MAT_COPY_VALUES,&Kgg);
+                        pg=(Vec)xmalloc(sizeof(Vec));
+                        VecDuplicate(pg_nopenalty,&pg);VecCopy(pg_nopenalty,pg);
+
+                        //apply penalties each time
+                        PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,inputs,analysis_type,sub_analysis_type); 
+                }
+                else{
+                        SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 
+                        //apply penalties
+                        PenaltySystemMatricesx(Kgg, pg,&melting_offset,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,inputs,analysis_type,sub_analysis_type); 
+                }
 
                 /*!Reduce matrix from g to f size:*/