Changeset 22643

Timestamp:

03/28/18 09:39:35 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed valgrind error when param is not a transient param

Location:

issm/trunk-jpl/src/c

Files:

• classes/Params/DoubleParam.h (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Params/DoubleParam.h

@@ -44 +44 @@
                 void  GetParameterValue(int** pintarray,int* pM);
                 void  GetParameterValue(int** pintarray,int* pM,int* pN);
-                void  GetParameterValue(IssmDouble* pIssmDouble){*pIssmDouble=value;}
-                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
+                void  GetParameterValue(IssmDouble* pIssmDouble){*pIssmDouble=value;};
+                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){*pdouble=value;};
                 void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
                 void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -178 +178 @@
                         iomodel->FindConstant(&interp,"md.timestepping.interp_forcings");
                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.deepwater_melting_rate"); 
-                        parameters->AddObject(new TransientParam(BasalforcingsDeepwaterMeltingRateEnum,&transparam[0],&transparam[M],interp,M)); _assert_(N==2 || N==1);
+                        if(N==1){
+                                _assert_(M==1);
+                                parameters->AddObject(new DoubleParam(BasalforcingsDeepwaterMeltingRateEnum,transparam[0]));
+                        }
+                        else{
+                                _assert_(N==2);
+                                parameters->AddObject(new TransientParam(BasalforcingsDeepwaterMeltingRateEnum,&transparam[0],&transparam[M],interp,M));
+                        }
+                        xDelete<IssmDouble>(transparam);
                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.deepwater_elevation"); 
-                        parameters->AddObject(new TransientParam(BasalforcingsDeepwaterElevationEnum,&transparam[0],&transparam[M],interp,M)); _assert_(N==2 || N==1);
+                        if(N==1){
+                                _assert_(M==1);
+                                parameters->AddObject(new DoubleParam(BasalforcingsDeepwaterElevationEnum,transparam[0]));
+                        }
+                        else{
+                                _assert_(N==2);
+                                parameters->AddObject(new TransientParam(BasalforcingsDeepwaterElevationEnum,&transparam[0],&transparam[M],interp,M)); 
+                        }
+                        xDelete<IssmDouble>(transparam);
                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.upperwater_elevation"); 
-                        parameters->AddObject(new TransientParam(BasalforcingsUpperwaterElevationEnum,&transparam[0],&transparam[M],interp,M)); _assert_(N==2 || N==1);
+                        if(N==1){
+                                _assert_(M==1);
+                                parameters->AddObject(new DoubleParam(BasalforcingsUpperwaterElevationEnum,transparam[0]));
+                        }
+                        else{
+                                _assert_(N==2);
+                                parameters->AddObject(new TransientParam(BasalforcingsUpperwaterElevationEnum,&transparam[0],&transparam[M],interp,M));
+                        }
+                        xDelete<IssmDouble>(transparam);
                         break;
                 case MismipFloatingMeltRateEnum:
@@ -210 +234 @@
                                 parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_T",BasalforcingsPicoGammaTEnum));
                                 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.farocean_temperature");
+                                _assert_(M==2 && N>1); 
                                 parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceantemperatureEnum,transparam,&transparam[N*(M-1)],interp,M,N));
                                 xDelete<IssmDouble>(transparam);
                                 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.farocean_salinity");
+                                _assert_(M==2 && N>1); 
                                 parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceansalinityEnum,transparam,&transparam[N*(M-1)],interp,M,N));
                                 xDelete<IssmDouble>(transparam);