Changeset 24054

Timestamp:

06/28/19 06:32:05 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to convert to PDouble

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (2 diffs)
• Loads/Channel.cpp (modified) (1 diff)
• Loads/Channel.h (modified) (1 diff)

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

@@ -2330 +2330 @@
                                                         ISSM_MPI_Bcast(&numchannels,1,ISSM_MPI_INT,0,IssmComm::GetComm());
 
-                                                        IssmDouble* values    = xNewZeroInit<IssmDouble>(numchannels);
-                                                        IssmDouble* allvalues = xNew<IssmDouble>(numchannels);
+                                                        IssmPDouble* values    = xNewZeroInit<IssmPDouble>(numchannels);
+                                                        IssmPDouble* allvalues = xNew<IssmPDouble>(numchannels);
 
                                                         /*Fill-in vector*/
@@ -2343 +2343 @@
                                                         /*Gather from all cpus*/
                                                         ISSM_MPI_Allreduce((void*)values,(void*)allvalues,numchannels,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
-                                                        xDelete<IssmDouble>(values);
-
-                                                        if(save_results)results->AddResult(new GenericExternalResult<IssmDouble*>(results->Size()+1,output_enum,allvalues,numchannels,1,step,time));
-                                                        xDelete<IssmDouble>(allvalues);
+                                                        xDelete<IssmPDouble>(values);
+
+                                                        if(save_results)results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,output_enum,allvalues,numchannels,1,step,time));
+                                                        xDelete<IssmPDouble>(allvalues);
 
                                                         isvec = true;

issm/trunk-jpl/src/c/classes/Loads/Channel.cpp

@@ -683 +683 @@
 }
 /*}}}*/
-void           Channel::WriteChannelCrossSection(IssmDouble* values){/*{{{*/
+void           Channel::WriteChannelCrossSection(IssmPDouble* values){/*{{{*/
 
         _assert_(values);
-        values[this->sid] = this->S;
-}
-/*}}}*/
+        values[this->sid] = reCast<IssmPDouble>(this->S);
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/Loads/Channel.h

@@ -78 +78 @@
                 ElementVector* CreatePVectorHydrologyGlaDS(void);
                 ElementMatrix* CreateKMatrixHydrologyGlaDS(void);
-                void           WriteChannelCrossSection(IssmDouble* values);
+                void           WriteChannelCrossSection(IssmPDouble* values);
                 /*}}}*/