Changeset 20235

Timestamp:

02/24/16 13:15:58 (9 years ago)

Author:

schlegel

Message:

CHG: add int cast to make intel compiler happy

Location:

issm/trunk-jpl/src/c

Files:

• cores/sealevelrise_core.cpp (modified) (2 diffs)
• main/issm_slr.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp

@@ -109 +109 @@
         
         /*retrieve the inter communicators that will be used to send data from each ice cap to the earth: */
-        if(modelid==earthid)femmodel->parameters->FindParam(&fromcomms,&nv,IcecapToEarthCommEnum);
-        else femmodel->parameters->FindParam(&tocomm, IcecapToEarthCommEnum);
+        if(modelid==earthid)femmodel->parameters->FindParam((int**)(&fromcomms),&nv,IcecapToEarthCommEnum);
+        else femmodel->parameters->FindParam((int*)(&tocomm), IcecapToEarthCommEnum);
 
         /*For each icecap, retrieve the forcing vector that will be sent to the earth model: */
@@ -228 +228 @@
         
         /*retrieve the inter communicators that will be used to send data from earth to ice caps:*/
-        if(modelid==earthid)femmodel->parameters->FindParam(&tocomms,&numcoms,IcecapToEarthCommEnum);
-        else femmodel->parameters->FindParam(&fromcomm, IcecapToEarthCommEnum);
+        if(modelid==earthid)femmodel->parameters->FindParam((int**)(&tocomms),&numcoms,IcecapToEarthCommEnum);
+        else femmodel->parameters->FindParam((int*)(&fromcomm), IcecapToEarthCommEnum);
 
 

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

@@ -99 +99 @@
         femmodel->parameters->AddObject(new IntParam(ModelIdEnum,modelid));
         femmodel->parameters->AddObject(new IntParam(EarthIdEnum,earthid));
-        if(modelid==earthid)femmodel->parameters->AddObject(new IntVecParam(IcecapToEarthCommEnum,fromicecomms,nummodels-1));
+        if(modelid==earthid)femmodel->parameters->AddObject(new IntVecParam(IcecapToEarthCommEnum,(int*)fromicecomms,nummodels-1));
         else femmodel->parameters->AddObject(new IntParam(IcecapToEarthCommEnum,toearthcomm));