Changeset 21226

Timestamp:

09/23/16 13:38:44 (8 years ago)

Author:

Eric.Larour

Message:

CHG: updated the sealevelrise_core transfer of slr back from the earth to the icecaps. The generic param template
was not being used to retrieve the MPI comms.

File:

• issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp (modified) (1 diff)

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

@@ -283 +283 @@
         
         /*retrieve the inter communicators that will be used to send data from earth to ice caps:*/
-        if(modelid==earthid)femmodel->parameters->FindParam((int**)(&tocomms),&numcoms,IcecapToEarthCommEnum);
-        else femmodel->parameters->FindParam((int*)(&fromcomm), IcecapToEarthCommEnum);
+        if(modelid==earthid){
+                GenericParam<ISSM_MPI_Comm*>* parcoms = dynamic_cast<GenericParam<ISSM_MPI_Comm*>*>(femmodel->parameters->FindParamObject(IcecapToEarthCommEnum));
+                if(!parcoms)_error_("TransferSealevel error message: could not find IcecapToEarthComm communicator");
+                tocomms=parcoms->GetParameterValue();
+                //femmodel->parameters->FindParam((int**)(&tocomms),&numcoms,IcecapToEarthCommEnum);
+        }
+        else{
+                GenericParam<ISSM_MPI_Comm>* parcom = dynamic_cast<GenericParam<ISSM_MPI_Comm>*>(femmodel->parameters->FindParamObject(IcecapToEarthCommEnum));
+                if(!parcom)_error_("TransferSealevel error message: could not find IcecapToEarthComm communicator");
+                fromcomm=parcom->GetParameterValue();
+                //femmodel->parameters->FindParam((int*)(&fromcomm), IcecapToEarthCommEnum);
+        }