Changeset 20345

Timestamp:

03/24/16 14:45:13 (9 years ago)

Author:

Eric.Larour

Message:

CHG: no need for eustatic boolean anymore, it's default.
Added a GenericParam container to IssmComm, otherwise, we have issues with gcc and intel compilers when adding comms
as IntParam objects in the parameters container.

Location:

issm/trunk-jpl/src/c

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp

@@ -65 +65 @@
         parameters->AddObject(iomodel->CopyConstantObject(SealevelriseRigidEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SealevelriseElasticEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SealevelriseEustaticEnum));
 
         iomodel->FetchData(&elastic,SealevelriseElasticEnum);

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

@@ -79 +79 @@
 
         /*Save communicator in the parameters dataset: */
-        this->parameters->AddObject(new IntParam(FemModelCommEnum,incomm));
+        this->parameters->AddObject(new GenericParam<ISSM_MPI_Comm>(incomm,FemModelCommEnum));
+
 
         /*Free resources */
@@ -104 +105 @@
         
         /*Save communicator in the parameters dataset: */
-        this->parameters->AddObject(new IntParam(FemModelCommEnum,incomm));
+        this->parameters->AddObject(new GenericParam<ISSM_MPI_Comm>(incomm,FemModelCommEnum));
 
 }
@@ -2324 +2325 @@
         ISSM_MPI_Reduce (&oceanarea_cpu,&oceanarea,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
         ISSM_MPI_Bcast(&oceanarea,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
-        
+
         ISSM_MPI_Reduce (&eartharea_cpu,&eartharea,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
         ISSM_MPI_Bcast(&eartharea,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
@@ -2602 +2603 @@
         
         /*Save communicator in the parameters dataset: */
-        this->parameters->AddObject(new IntParam(FemModelCommEnum,incomm));
+        this->parameters->AddObject(new GenericParam<ISSM_MPI_Comm>(incomm,FemModelCommEnum));
 
 }