Changeset 20348

Timestamp:

03/24/16 14:47:22 (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/cores/sealevelrise_core.cpp (modified) (2 diffs)

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

@@ -56 +56 @@
                 Sg_eustatic=sealevelrise_core_eustatic(femmodel); //generalized eustatic (Farrel and Clark, Eq 4, 1st, 3rd and 4rd terms on the RHS.
 
-                Sg=sealevelrise_core_noneustatic(femmodel,Sg_eustatic); //sea-level rise dependent terms (2nd and 5th terms on the RHS)
+                Sg=sealevelrise_core_noneustatic(femmodel,Sg_eustatic); //ocean loading tems  (2nd and 5th terms on the RHS of Farrel and Clark)
 
                 /*get results into elements:*/
@@ -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((int**)(&fromcomms),&nv,IcecapToEarthCommEnum);
-        else femmodel->parameters->FindParam((int*)(&tocomm), IcecapToEarthCommEnum);
+        if(modelid==earthid){
+                GenericParam<ISSM_MPI_Comm*>* parcoms = dynamic_cast<GenericParam<ISSM_MPI_Comm*>*>(femmodel->parameters->FindParamObject(IcecapToEarthCommEnum));
+                if(!parcoms)_error_("TransferForcing error message: could not find IcecapToEarthComm communicator");
+                fromcomms=parcoms->GetParameterValue();
+        }
+        else {
+                GenericParam<ISSM_MPI_Comm>* parcom = dynamic_cast<GenericParam<ISSM_MPI_Comm>*>(femmodel->parameters->FindParamObject(IcecapToEarthCommEnum));
+                if(!parcom)_error_("TransferForcing error message: could not find IcecapToEarthComm communicator");
+                tocomm=parcom->GetParameterValue();
+        }
 
         /*For each icecap, retrieve the forcing vector that will be sent to the earth model: */