source: issm/oecreview/Archive/13393-13976/ISSM-13938-13939.diff@ 14312

../trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp

@@ -1 @@
-/*!\file CreateJacobianMatrixx
- * \brief: create system matrices (stiffness matrix, loads vector)
- */
-
-#include "./CreateJacobianMatrixx.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../io/io.h"
-#include "../../toolkits/toolkits.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-
-void CreateJacobianMatrixx(Matrix<IssmDouble>** pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,IssmDouble kmax){
-
-        int      i,connectivity;
-        int      numberofdofspernode;
-        int      fsize,configuration_type;
-        Element *element = NULL;
-        Load    *load    = NULL;
-        Matrix<IssmDouble>*  Jff     = NULL;
-
-        /*Checks*/
-        _assert_(nodes && elements);
-
-        /*Recover some parameters*/
-        parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        parameters->FindParam(&connectivity,MeshAverageVertexConnectivityEnum);
-        fsize=nodes->NumberOfDofs(configuration_type,FsetEnum);
-        numberofdofspernode=nodes->MaxNumDofs(configuration_type,GsetEnum);
-
-        /*Initialize Jacobian Matrix*/
-        Jff=new Matrix<IssmDouble>(fsize,fsize,connectivity,numberofdofspernode);
-
-        /*Create and assemble matrix*/
-        for(i=0;i<elements->Size();i++){
-                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                element->CreateJacobianMatrix(Jff);
-        }
-        for (i=0;i<loads->Size();i++){
-                load=(Load*)loads->GetObjectByOffset(i);
-                if(load->InAnalysis(configuration_type)) load->CreateJacobianMatrix(Jff);
-                if(load->InAnalysis(configuration_type)) load->PenaltyCreateJacobianMatrix(Jff,kmax);
-        }
-        Jff->Assemble();
-
-        /*Assign output pointer*/
-        *pJff=Jff;
-}

../trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h

@@ -1 @@
-/*!\file:  CreateJacobianMatrixx.h
- * \brief header file for degree of freedoms distribution routines.
- */ 
-
-#ifndef _CREATEJACOBIANMATRIXX_H
-#define _CREATEJACOBIANMATRIXX_H
-
-#include "../../Container/Container.h"
-#include "../../classes/objects/objects.h"
-
-/* local prototypes: */
-void CreateJacobianMatrixx(Matrix<IssmDouble>** pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,IssmDouble kmax);
-
-#endif  /* _CREATEJACOBIANMATRIXX_H */

../trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp

@@ -14 +14 @@
         int         configuration_type;
         int         fsize;
         IssmDouble *ug_serial = NULL;
-        bool        oldalloc  = false;
+        bool        oldalloc  = true;
 
         /*first figure out fsize: */
         parameters->FindParam(&configuration_type,ConfigurationTypeEnum);

../trunk-jpl/src/c/modules/modules.h

@@ -90 +90 @@
 #include "./Solverx/Solverx.h"
 #include "./SpcNodesx/SpcNodesx.h"
 #include "./SurfaceAreax/SurfaceAreax.h"
-#include "./CreateJacobianMatrixx/CreateJacobianMatrixx.h"
 #include "./TriaSearchx/TriaSearchx.h"
 #include "./TriMeshx/TriMeshx.h"
 #include "./TriMeshProcessRiftsx/TriMeshProcessRiftsx.h"

../trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp

@@ -19 +19 @@
         int         Kfsm,Kfsn;
         int         global_m,global_n;
         bool        fromlocalsize = true;
+        bool        oldalloc  = true;
 
         if(VerboseModule()) _pprintLine_("   Dirichlet lifting applied to load vector");
 
@@ -30 +31 @@
 
                 /*pf = pf - Kfs * y_s;*/
                 Kfs->GetLocalSize(&Kfsm,&Kfsn);
-                Kfsy_s=new Vector<IssmDouble>(Kfsm,fromlocalsize);
+                if(oldalloc)
+                 Kfsy_s=new Vector<IssmDouble>(Kfsm,fromlocalsize);
+                else
+                 Kfsy_s=new Vector<IssmDouble>(Kfsm,global_m);
+
                 if (flag_ys0){
 
                         /*Create y_s0, full of 0: */

../trunk-jpl/src/c/Makefile.am

@@ -298 +298 @@
                                         ./modules/EnumToStringx/EnumToStringx.h\
                                         ./modules/StringToEnumx/StringToEnumx.cpp\
                                         ./modules/StringToEnumx/StringToEnumx.h\
-                                        ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp\
-                                        ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h\
                                         ./modules/ConstraintsStatex/ConstraintsStatex.cpp\
                                         ./modules/ConstraintsStatex/ConstraintsStatex.h\
                                         ./modules/ConstraintsStatex/ConstraintsStateLocal.h\

../trunk-jpl/src/c/classes/FemModel.cpp

@@ -352 +352 @@
         Vector<IssmDouble> *pf   = NULL;
         Vector<IssmDouble> *df   = NULL;
 
-        bool oldalloc=false;
+        bool oldalloc=true;
 
         /*retrieve parameters: */
         this->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
@@ -537 +537 @@
         xDelete<int>(next_l);
 
         /*sum over all cpus*/
-        #ifdef _HAVE_MPI_
+#ifdef _HAVE_MPI_
         MPI_Allreduce((void*)connectivity_clone,(void*)all_connectivity_clone,numnodes,MPI_INT,MPI_SUM,IssmComm::GetComm());
-        #endif
+#endif
         xDelete<int>(connectivity_clone);
 
         if(set1enum==FsetEnum){
@@ -573 +573 @@
         *po_nnz=o_nnz;
 
 }/*}}}*/
+void FemModel::CreateJacobianMatrixx(Matrix<IssmDouble>** pJff,IssmDouble kmax){/*{{{*/
+
+        int      i,connectivity;
+        int      numberofdofspernode;
+        int      fsize,configuration_type;
+        Element *element = NULL;
+        Load    *load    = NULL;
+        Matrix<IssmDouble>* Jff = NULL;
+
+        /*Checks*/
+        _assert_(nodes && elements);
+
+        /*Recover some parameters*/
+        parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
+        parameters->FindParam(&connectivity,MeshAverageVertexConnectivityEnum);
+        fsize=nodes->NumberOfDofs(configuration_type,FsetEnum);
+        numberofdofspernode=nodes->MaxNumDofs(configuration_type,GsetEnum);
+
+        /*Initialize Jacobian Matrix*/
+        this->AllocateSystemMatrices(&Jff,NULL,NULL,NULL);
+        Jff=new Matrix<IssmDouble>(fsize,fsize,connectivity,numberofdofspernode);
+
+        /*Create and assemble matrix*/
+        for(i=0;i<elements->Size();i++){
+                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+                element->CreateJacobianMatrix(Jff);
+        }
+        for (i=0;i<loads->Size();i++){
+                load=(Load*)loads->GetObjectByOffset(i);
+                if(load->InAnalysis(configuration_type)) load->CreateJacobianMatrix(Jff);
+                if(load->InAnalysis(configuration_type)) load->PenaltyCreateJacobianMatrix(Jff,kmax);
+        }
+        Jff->Assemble();
+
+        /*Assign output pointer*/
+        *pJff=Jff;
+
+}/*}}}*/
 int  FemModel::UpdateVertexPositionsx(void){ /*{{{*/
 
         int     i;

../trunk-jpl/src/c/classes/FemModel.h

@@ -52 +52 @@
 
                 /*Methods:*/
                 void AllocateSystemMatrices(Matrix<IssmDouble>** pKff,Matrix<IssmDouble>** pKfs,Vector<IssmDouble>** pdf,Vector<IssmDouble>** ppf);
+                void CreateJacobianMatrixx(Matrix<IssmDouble>** pJff,IssmDouble kmax);
                 void Echo();
                 void InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int solution_type,const int* analyses,const int nummodels);
                 void MatrixNonzeros(int** pd_nnz,int** po_nnz,int set1enum,int set2enum);