Changeset 24108

Timestamp:

07/29/19 05:26:20 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/src/c

Files:

• classes/Contours.h (modified) (2 diffs)
• modules/SystemMatricesx/SystemMatricesx.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_glads_nonlinear.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Contours.h

@@ -22 +22 @@
 
         /*intermediary: */
-        int                  nprof;
-        int                 *profnvertices = NULL;
-        doubletype         **pprofx        = NULL;
-        doubletype         **pprofy        = NULL;
-
-        /*output: */
-        Contours *domain = NULL;
+        int          nprof;
+        int         *profnvertices = NULL;
+        doubletype **pprofx        = NULL;
+        doubletype **pprofy        = NULL;
 
         /*If domainname is an empty string, return empty dataset*/
@@ -35 +32 @@
         }
         else{
-                ExpRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
+                ExpRead<doubletype>(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
         }
 
         /*now create dataset of contours: */
-        domain=new Contours();
+        Contours *domain=new Contours();
 
         for(int i=0;i<nprof;i++){

issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp

@@ -120 +120 @@
         //Kff->AllocationInfo();
         //Kfs->AllocationInfo();
+        if(analysisenum==GLheightadvectionAnalysisEnum){
+                PetscViewer viewer;      PetscViewerASCIIOpen(PETSC_COMM_WORLD,"KFF.m",&viewer);      PetscViewerPushFormat(viewer,PETSC_VIEWER_ASCII_MATLAB);
+                MatView(Kff->pmatrix->matrix,viewer);
+                PetscViewerPopFormat(viewer);
+                PetscViewerDestroy(&viewer);
+        for(int e=0;e<femmodel->elements->Size();e++){
+                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(e));
+                int numdofs;
+                for(int i=0;i<element->GetNumberOfNodes();i++){
+                        numdofs=element->nodes[i]->GetNumberOfDofs(NoneApproximationEnum,FsetEnum);
+                        int  *doflist = xNew<int>(numdofs);
+                        element->nodes[i]->GetDofList(doflist,NoneApproximationEnum,FsetEnum);
+                        for(int j=0;j<numdofs;j++){
+                                if(doflist[j]==11796-1){
+                                        printf("node: %i, element: %i, element->nodes[i]->Sid: %i \n", i, element->id, element->nodes[i]->Sid());
+                                }
+                        }
+                        xDelete<int>(doflist);
+                }
+        }
+        }
 
         /*cleanu up and assign output pointers: */

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_glads_nonlinear.cpp

@@ -77 +77 @@
 
                 /*Converged if inner loop converged in one solution*/
-                //if(count_in==1) converged_out = true;
+                if(count_in==1) converged_out = true;
 
                 /*Increase count: */