Changeset 22799

Timestamp:

05/21/18 13:43:56 (7 years ago)

Author:

seroussi

Message:

CHG: send the right base to the ocean model

File:

• issm/trunk-jpl/src/c/cores/transient_core.cpp (modified) (3 diffs)

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

@@ -178 +178 @@
                         tomitgcmcomm=parcom->GetParameterValue();
                         if(my_rank==0){
-                                int ngrids_ocean;
+                                int ngrids_ocean, nels_ocean;
                                 IssmDouble oceantime;
                                 IssmDouble rho_ice;
@@ -194 +194 @@
                                 int*        index_ice= NULL;
                                 int*        index_ocean = NULL;
-                                int         nels_ocean;
                                 int         ngrids_ice=femmodel->vertices->NumberOfVertices();
                                 int         nels_ice=femmodel->elements->NumberOfElements();
@@ -214 +213 @@
 
                                 /*Interpolate ice base onto ocean grid*/
-//                              InputUpdateFromVectorx(femmodel,melt_mesh,BasalforcingsFloatingiceMeltingRateEnum,VertexSIdEnum);
+                                GetVectorFromInputsx(&icebase,femmodel,BaseEnum,VertexSIdEnum);
                                 InterpFromMeshToMesh2dx(&base_oceangrid,index_ice,lon_ice,lat_ice,ngrids_ice,nels_ice,
                                                         icebase,ngrids_ice,1,