Changeset 20346

Timestamp:

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

Author:

Eric.Larour

Message:

CHG: encapsulating ISSM COMM objects into a GenericParam object to avoid issues with gcc and intel compilers.

File:

• issm/trunk-jpl/src/c/main/issm_slr.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/main/issm_slr.cpp

@@ -95 +95 @@
         
         /*Now that the models are initialized, keep communicator information in the parameters datasets of each model: */
-        femmodel->parameters->AddObject(new IntParam(WorldCommEnum,worldcomm));
+        femmodel->parameters->AddObject(new GenericParam<ISSM_MPI_Comm>(worldcomm,WorldCommEnum));
         femmodel->parameters->AddObject(new IntParam(NumModelsEnum,nummodels));
         femmodel->parameters->AddObject(new IntParam(ModelIdEnum,modelid));
         femmodel->parameters->AddObject(new IntParam(EarthIdEnum,earthid));
-        if(modelid==earthid)femmodel->parameters->AddObject(new IntVecParam(IcecapToEarthCommEnum,(int*)fromicecomms,nummodels-1));
-        else femmodel->parameters->AddObject(new IntParam(IcecapToEarthCommEnum,toearthcomm));
+        if(modelid==earthid) femmodel->parameters->AddObject(new GenericParam<ISSM_MPI_Comm*>(fromicecomms,IcecapToEarthCommEnum));
+        else femmodel->parameters->AddObject(new GenericParam<ISSM_MPI_Comm>(toearthcomm,IcecapToEarthCommEnum));
 
         /*Solve: */