Changeset 11422

Timestamp:

02/13/12 18:26:55 (13 years ago)

Author:

cborstad

Message:

cleanup after merge

Location:

issm/trunk-jpl-damage/src/c/objects

Files:

• Elements/Penta.h (modified) (1 diff)
• Elements/Tria.cpp (modified) (1 diff)
• Elements/Tria.h (modified) (1 diff)
• KML/KML_File.cpp (modified) (1 diff)
• KML/KML_Object.cpp (modified) (3 diffs)
• KML/KML_Unknown.cpp (modified) (4 diffs)
• Loads/Penpair.h (modified) (1 diff)
• Materials/Matice.cpp (modified) (1 diff)
• Materials/Matice.h (modified) (1 diff)
• Numerics/ElementMatrix.cpp (modified) (2 diffs)
• Numerics/ElementMatrix.h (modified) (1 diff)

issm/trunk-jpl-damage/src/c/objects/Elements/Penta.h

@@ -88 +88 @@
                 void   CreateKMatrix(Mat Kff, Mat Kfs,Vec df);
                 void   CreatePVector(Vec pf);
+                void   CreateJacobianMatrix(Mat Jff);
                 void   DeleteResults(void);
                 int    GetNodeIndex(Node* node);

issm/trunk-jpl-damage/src/c/objects/Elements/Tria.cpp

@@ -3103 +3103 @@
                 thickness_input->GetInputValue(&thickness, gauss);
                 this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input);
-                matice->GetViscosity2dDerivativeEpsSquare(&mu_prime,&epsilon[0]);
+                matice->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]);
                 eps1[0]=2*epsilon[0]+epsilon[1];   eps2[0]=epsilon[2];
                 eps1[1]=epsilon[2];                eps2[1]=epsilon[0]+2*epsilon[1];

issm/trunk-jpl-damage/src/c/objects/Elements/Tria.h

@@ -141 +141 @@
                 #ifdef _HAVE_CONTROL_
                 double DragCoefficientAbsGradient(bool process_units,int weight_index);
+                void   GradientIndexing(int* indexing,int control_index);
                 void   Gradj(Vec gradient,int control_type);
                 void   GradjBGradient(Vec gradient,int weight_index);

issm/trunk-jpl-damage/src/c/objects/KML/KML_File.cpp

@@ -65 +65 @@
         _printf_(flag,"%sKML_File:\n",indent);
         KML_Object::DeepEcho(indent);
-
-/*  loop over the kml objects for the file  */
-
-        memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char));
-
-        strcat(indent2,"  ");
-
-        if (kmlobj->Size())
-                for (i=0; i<kmlobj->Size(); i++) {
-                        _printf_(flag,"%s        kmlobj: -------- begin [%d] --------\n" ,indent,i);
-                        ((KML_Object *)kmlobj->GetObjectByOffset(i))->DeepEcho(indent2);
-                        _printf_(flag,"%s        kmlobj: --------  end  [%d] --------\n" ,indent,i);
-                }
-        else
-                _printf_(flag,"%s        kmlobj: [empty]\n"    ,indent);
 
         return;

issm/trunk-jpl-damage/src/c/objects/KML/KML_Object.cpp

@@ -117 +117 @@
 void  KML_Object::Write(FILE* filout,const char* indent){
 
+        int   i;
+        char  indent2[81];
+
 //  attributes always written in keyword line of derived classes
 //  comments always written after keyword line of derived classes
 
-        ;
+/*  loop over the unknown objects for the object  */
 
         memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char));
@@ -135 +138 @@
 /*FUNCTION KML_Object::Read {{{1*/
 void  KML_Object::Read(FILE* fid,char* kstr){
+
+        KML_Object*  kobj;
 
 /*  process field within opening and closing tags  */
@@ -249 +254 @@
         else if (!strncmp(kstr,"<",1)) {
                 _printf_(true,"KML_Object::Read -- Unrecognized opening tag %s.\n",kstr);
-<<<<<<< .working
-                KMLFileTagSkip(kstr,
-                                           fid);
-=======
 //              KMLFileTagSkip(kstr,
 //                                         fid);

issm/trunk-jpl-damage/src/c/objects/KML/KML_Unknown.cpp

@@ -107 +107 @@
         WriteCommnt(filout,indent);
 
-        KML_Object::Write(filout,indent);
-
-        if (value     )
-                fprintf(filout,"%s  %s\n",indent,value);
         if (value     ) {
                 valuei=(char *) xmalloc((strlen(value)+1)*sizeof(char));
@@ -139 +135 @@
         char         nl[]={'\n','\0'};
 
+/*  get object name  */
+
+        /*name=KMLFileTagName(NULL,
+                                                kstr);*/
+//      _printf_(true,"KML_Unknown::Read -- opening name=%s.\n",name);
+
 /*  get object attributes and check for solo tag  */
 
@@ -149 +151 @@
         while (kstri=KMLFileToken(fid,
                                                           &ncom,&pcom)) {
+//              _printf_(true,"KML_Unknown::Read -- kstri=%s.\n",kstri);
                 if      (!strncmp(&kstri[0],"</", 2) &&
                                  !strncmp(&kstri[2],name,strlen(name))) {
+//                      _printf_(true,"KML_Unknown::Read -- closing name=%s.\n",name);
                         xfree((void**)&kstri);
                         break;
@@ -157 +161 @@
                         _error_("KML_Unknown::Read -- Unexpected closing tag %s.\n",kstri);
 
-                else if (strncmp(kstri,"<",1))
-                        KMLFileTokenParse( value     ,NULL,0,
-                                                          NULL,
-                                                          fid);
                 else if (strncmp(kstri,"<",1)) {
                         if (value) {

issm/trunk-jpl-damage/src/c/objects/Loads/Penpair.h

@@ -64 +64 @@
                 void  CreateKMatrix(Mat Kff, Mat Kfs);
                 void  CreatePVector(Vec pf);
-                void  PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax);
+                void  CreateJacobianMatrix(Mat Jff);
+                void  PenaltyCreateKMatrix(Mat Kff, Mat Kfs,double kmax);
                 void  PenaltyCreatePVector(Vec pf, double kmax);
+                void  PenaltyCreateJacobianMatrix(Mat Jff,double kmax);
                 bool  InAnalysis(int analysis_type);
                 /*}}}*/

issm/trunk-jpl-damage/src/c/objects/Materials/Matice.cpp

@@ -608 +608 @@
 }
 /*}}}*/
-/*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{1*/
-void  Matice::GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* epsilon){
+/*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{1*/
+void  Matice::GetViscosityDerivativeEpsSquare(double* pmu_prime, double* epsilon){
 
         /*output: */

issm/trunk-jpl-damage/src/c/objects/Materials/Matice.h

@@ -69 +69 @@
                 void   GetViscosityComplement(double* pviscosity_complement, double* pepsilon);
                 void   GetViscosityZComplement(double* pviscosity_complement, double* pepsilon);
-                void   GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* pepsilon);
+                void   GetViscosityDerivativeEpsSquare(double* pmu_prime, double* pepsilon);
                 double GetB();
                 double GetBbar();

issm/trunk-jpl-damage/src/c/objects/Numerics/ElementMatrix.cpp

@@ -251 +251 @@
         double* localvalues=NULL;
 
+        /*If Kfs is not provided, call the other function*/ 
+        if(!Kfs){ 
+                this->AddToGlobal(Kff); 
+                return; 
+        } 
+
         /*In debugging mode, check consistency (no NaN, and values not too big)*/
         this->CheckConsistency();
@@ -294 +300 @@
 }
 /*}}}*/
+/*FUNCTION ElementMatrix::AddToGlobal(Mat Jff){{{1*/
+void ElementMatrix::AddToGlobal(Mat Jff){
+          
+        int i,j;
+        double* localvalues=NULL;
+        
+        /*Check that Jff is not NULL*/
+        _assert_(Jff); 
+        
+        /*In debugging mode, check consistency (no NaN, and values not too big)*/
+        this->CheckConsistency();
+        
+        if(this->dofsymmetrical){
+                /*only use row dofs to add values into global matrices: */
+                
+                if(this->row_fsize){
+                        /*first, retrieve values that are in the f-set from the g-set values matrix: */
+                        localvalues=(double*)xmalloc(this->row_fsize*this->row_fsize*sizeof(double));
+                        for(i=0;i<this->row_fsize;i++){
+                                for(j=0;j<this->row_fsize;j++){
+                                        *(localvalues+this->row_fsize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]);
+                                }
+                        }
+                        /*add local values into global  matrix, using the fglobaldoflist: */
+                        MatSetValues(Jff,this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,(const double*)localvalues,ADD_VALUES);
+                        
+                        /*Free ressources:*/
+                        xfree((void**)&localvalues);
+                }
+                
+        }
+        else{
+                _error_(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
+        }
+        
+}
+/*}}}*/
 /*FUNCTION ElementMatrix::CheckConsistency{{{1*/
 void ElementMatrix::CheckConsistency(void){

issm/trunk-jpl-damage/src/c/objects/Numerics/ElementMatrix.h

@@ -59 +59 @@
                 /*ElementMatrix specific routines {{{1*/
                 void AddToGlobal(Mat Kff, Mat Kfs);
+                void AddToGlobal(Mat Jff);
                 void Echo(void);
                 void CheckConsistency(void);