Changeset 20134

Timestamp:

02/11/16 19:38:56 (9 years ago)

Author:

Eric.Larour

Message:

CHG: fixed issue with mesh3dsurface in the Node.cpp class.
Also simplified FemModel to not include the communicators in the structure, but rather in the parameters dataset.

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (9 diffs)
• FemModel.h (modified) (2 diffs)
• Node.cpp (modified) (2 diffs)

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

@@ -58 +58 @@
 
         /*First things first, store the communicator, and set it as a global variable: */
-        this->comm=incomm;
-        this->SetStaticComm();
+        IssmComm::SetComm(incomm);
 
         /*Now, initialize PETSC: */
         #ifdef _HAVE_PETSC_
-        PETSC_COMM_WORLD=this->comm;
+        PETSC_COMM_WORLD=incomm;
         ierr=PetscInitialize(&argc,&argv,(char*)0,"");  if(ierr) _error_("Could not initialize Petsc");
         #endif
@@ -79 +78 @@
         profiler->Tag(FinishInit);
 
+        /*Save communicator in the parameters dataset: */
+        this->parameters->AddObject(new IntParam(FemModelCommEnum,incomm));
 
         /*Free resources */
@@ -97 +98 @@
         /*Store the communicator, but do not set it as a global variable, as this has already 
          * been done by the FemModel that called this copy constructor: */
-        this->comm=incomm;
-        this->SetStaticComm();
+        IssmComm::SetComm(incomm);
 
         /*Create femmodel from input files, with trace activated: */
         this->InitFromFiles(rootpath,inputfilename,outputfilename,toolkitsfilename,lockfilename,restartfilename, solution_type,traceon,X);
+        
+        /*Save communicator in the parameters dataset: */
+        this->parameters->AddObject(new IntParam(FemModelCommEnum,incomm));
 
 }
@@ -266 +269 @@
 }
 /*}}}*/
-void FemModel::SetStaticComm(void){/*{{{*/
-
-        /*This routine sets the global communicator variable hidden inside the IssmComm 
-         *class: */
-        IssmComm::SetComm(this->comm);
-
-}
-/*}}}*/
 void FemModel::SetCurrentConfiguration(int configuration_type,int analysis_type){/*{{{*/
 
@@ -381 +376 @@
         output=new FemModel(*this); //Use default copy constructor.
 
-        output->comm = this->comm;
         output->nummodels = this->nummodels;
         output->solution_type = this->solution_type;
@@ -547 +541 @@
 
                 case TransientSolutionEnum:{
-                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage,issmb;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage,issmb,isslr;
                         iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
                         iomodel->Constant(&isFS,FlowequationIsFSEnum);
@@ -559 +553 @@
                         iomodel->Constant(&ishydrology,TransientIshydrologyEnum);
                         iomodel->Constant(&issmb,TransientIssmbEnum);
+                        iomodel->Constant(&isslr,TransientIsslrEnum);
                         if(isstressbalance){
                                 int  fe_FS;
@@ -599 +594 @@
                         if(isdamage){
                                 analyses_temp[numanalyses++]=DamageEvolutionAnalysisEnum;
+                        }
+                        if(isslr){
+                                analyses_temp[numanalyses++]=SealevelriseAnalysisEnum;
                         }
 
@@ -2552 +2550 @@
         /*First things first, store the communicator, and set it as a global variable: */
         this->comm=incomm;
-        this->SetStaticComm();
+        IssmComm::SetComm(this->comm);
 
         /*Start profiler: */

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

@@ -43 +43 @@
                 Parameters  *parameters;           //one set of parameters, independent of the analysis_type
                 Results     *results;              //results that cannot be fit into the elements 
-                ISSM_MPI_Comm        comm;                  //communicator for this particular model
 
                 /*constructors, destructors: */
@@ -57 +56 @@
                 void CleanUp(void);
                 void Solve(void);
-                void SetStaticComm();
                 void SetCurrentConfiguration(int configuration_type);
                 void SetCurrentConfiguration(int configuration_type,int analysis_type);

issm/trunk-jpl/src/c/classes/Node.cpp

@@ -59 +59 @@
                 _assert_(sqrt( coord_system[0][0]*coord_system[0][0] + coord_system[1][0]*coord_system[1][0]) >1.e-4);
 
-                if(iomodel->domaintype!=Domain2DhorizontalEnum){
+                if(iomodel->domaintype!=Domain2DhorizontalEnum & iomodel->domaintype!=Domain3DsurfaceEnum){
                         /*We have a  3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */
                         _assert_(iomodel->Data(MeshVertexonbaseEnum)); 
@@ -97 +97 @@
                                 analysis_enum==LevelsetAnalysisEnum
                                 ){
-                if(iomodel->domaintype!=Domain2DhorizontalEnum){
+                if(iomodel->domaintype!=Domain2DhorizontalEnum & iomodel->domaintype!=Domain3DsurfaceEnum & iomodel->domaintype!=Domain3DsurfaceEnum){
                         /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */
                         _assert_(iomodel->Data(MeshVertexonbaseEnum));