Index: /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 24578) +++ /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 24579) @@ -96,8 +96,8 @@ iomodel->FindConstant(&isfirnwarming,"md.smb.isfirnwarming"); iomodel->FetchDataToInput(inputs2,elements,"md.smb.smb_corr",SmbSmbCorrEnum); - iomodel->FetchDataToInput(inputs2,elements,"md.smb.precipitation",SmbPrecipitationEnum); - iomodel->FetchDataToInput(inputs2,elements,"md.smb.monthlytemperatures",SmbMonthlytemperaturesEnum); iomodel->FetchDataToInput(inputs2,elements,"md.smb.precipitation_anomaly",SmbPrecipitationsAnomalyEnum); iomodel->FetchDataToInput(inputs2,elements,"md.smb.temperature_anomaly",SmbTemperaturesAnomalyEnum); + iomodel->FetchDataToDatasetInput(inputs2,elements,"md.smb.monthlytemperatures",SmbMonthlytemperaturesEnum); + iomodel->FetchDataToDatasetInput(inputs2,elements,"md.smb.precipitation",SmbPrecipitationEnum); break; case SMBd18opddEnum: Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24578) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24579) @@ -3030,4 +3030,7 @@ IssmDouble mu = MU_0*(1000.0*86400.0)*(rho_ice/rho_water); // (d*deg C)/(mm WE) --> (s*deg C)/(m IE) + /*Get inputs*/ + DatasetInput2* dinput =this->GetDatasetInput2(SmbMonthlytemperaturesEnum); _assert_(dinput); + DatasetInput2* dinput2=this->GetDatasetInput2(SmbPrecipitationEnum); _assert_(dinput2); /*loop over vertices: */ @@ -3035,13 +3038,9 @@ for(int month=0;month<12;month++){ - /*Recover monthly temperatures and precipitation*/ - Input2* dinput =this->GetInput2(SmbMonthlytemperaturesEnum,reCast(month+1)/12.*yts); _assert_(dinput); - Input2* dinput2=this->GetInput2(SmbPrecipitationEnum,reCast(month+1)/12.*yts); _assert_(dinput2); - for(int iv=0;ivGaussVertex(iv); - dinput->GetInputValue(&monthlytemperatures[iv*12+month],gauss); + dinput->GetInputValue(&monthlytemperatures[iv*12+month],gauss,month); monthlytemperatures[iv*12+month]=monthlytemperatures[iv*12+month]-273.15; // conversion from Kelvin to celcius for PDD module - dinput2->GetInputValue(&monthlyprec[iv*12+month],gauss); + dinput2->GetInputValue(&monthlyprec[iv*12+month],gauss,month); monthlyprec[iv*12+month]=monthlyprec[iv*12+month]*yts; } Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24578) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24579) @@ -233,6 +233,7 @@ /*Intermediaries*/ + int vertexsids[NUMVERTICES]; + int vertexlids[NUMVERTICES]; IssmDouble nodeinputs[NUMVERTICES]; - int vertexlids[NUMVERTICES]; /*Some sanity checks*/ @@ -244,13 +245,12 @@ _assert_(iomodel->elements); for(int i=0;i(iomodel->elements[NUMVERTICES*this->Sid()+i]); //ids for vertices are in the elements array from Matlab - - vertexlids[i]=iomodel->my_vertices_lids[vertexid-1]; - nodeinputs[i]=array[vertexid*N+i]; + vertexsids[i] = reCast(iomodel->elements[NUMVERTICES*this->Sid()+i])-1; + vertexlids[i] = iomodel->my_vertices_lids[vertexsids[i]]; } /*Create inputs and add to DataSetInput*/ for(int i=0;iinputs2->SetTriaDatasetInput(input_enum,individual_enums[i],P1Enum,NUMVERTICES,vertexlids,nodeinputs); break; + for(int j=0;jSetTriaDatasetInput(input_enum,individual_enums[i],P1Enum,NUMVERTICES,vertexlids,nodeinputs); } } Index: /issm/trunk-jpl/src/c/classes/Inputs2/DatasetInput2.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs2/DatasetInput2.cpp (revision 24578) +++ /issm/trunk-jpl/src/c/classes/Inputs2/DatasetInput2.cpp (revision 24579) @@ -207,5 +207,5 @@ if(index == -1){ this->Echo(); - _error_("Could not find input "<(doublearray); - xDelete(string); +} +/*}}}*/ +void IoModel::FetchDataToDatasetInput(Inputs2* inputs2,Elements* elements,const char* vector_name,int input_enum){/*{{{*/ + + /*First, look whether it is not already loaded in this->data*/ + vector::iterator iter; + for(iter=data.begin();itername,vector_name)==0){ + for(int i=0;iSize();i++){ + Element* element=xDynamicCast(elements->GetObjectByOffset(i)); + _error_("to be implemented..."); + //element->InputCreate(iodata->data,inputs2,this,iodata->M,iodata->N,iodata->layout,input_enum,iodata->code);//we need i to index into elements. + } + return; + } + } + + /*intermediary: */ + int code,vector_layout; + IssmDouble *doublearray = NULL; + int M,N; + + /*First of, find the record for the name, and get code of data type: */ + this->SetFilePointerToData(&code,&vector_layout,vector_name); + + switch(code){ + case 1: //boolean constant + _error_("not implemented yet"); + break; + case 2: //integer constant + _error_("not implemented yet"); + break; + case 3: //IssmDouble constant + _error_("not implemented yet"); + break; + case 5: //boolean vector + _error_("not implemented yet"); + break; + case 6: //int vector + _error_("not implemented yet"); + break; + case 7: //IssmDouble vector + { + this->FetchData(&doublearray,&M,&N,vector_name); + if(!doublearray) _error_("\""<(N); + for(int i=0;iSize();i++){ + Element* element=xDynamicCast(elements->GetObjectByOffset(i)); + element->DatasetInputCreate(doublearray,M,N,ids,N,inputs2,this,input_enum); + } + xDelete(ids); + } + break; + default: + _error_("data code " << code << " not supported yet (detected while processing \""<(doublearray); } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/IoModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.h (revision 24578) +++ /issm/trunk-jpl/src/c/classes/IoModel.h (revision 24579) @@ -141,4 +141,5 @@ void FetchDataToInput(Inputs2* inputs2,Elements* elements,const char* vector_name,int input_enum); void FetchDataToInput(Inputs2* inputs2,Elements* elements,const char* vector_name,int input_enum,IssmDouble default_value); + void FetchDataToDatasetInput(Inputs2* inputs2,Elements* elements,const char* vector_name,int input_enum); void FetchIndependent(const char* dependent_name); void FetchMultipleData(char*** pstringarray,int* pnumstrings,const char* data_name); Index: /issm/trunk-jpl/test/NightlyRun/test245.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test245.m (revision 24578) +++ /issm/trunk-jpl/test/NightlyRun/test245.m (revision 24579) @@ -18,7 +18,5 @@ for imonth=0:11 md.smb.monthlytemperatures(1:md.mesh.numberofvertices,imonth+1)=md.materials.meltingpoint+temp_ma_present+(temp_mj_present-temp_ma_present)*sin(double(imonth+1-4)*pi/6.0); - md.smb.monthlytemperatures(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12); md.smb.precipitation(1:md.mesh.numberofvertices,imonth+1)=precipitation; - md.smb.precipitation(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12); end Index: /issm/trunk-jpl/test/NightlyRun/test245.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test245.py (revision 24578) +++ /issm/trunk-jpl/test/NightlyRun/test245.py (revision 24579) @@ -30,7 +30,5 @@ for imonth in range(12): md.smb.monthlytemperatures[0:md.mesh.numberofvertices, imonth] = md.materials.meltingpoint + temp_ma_present + (temp_mj_present - temp_ma_present) * np.sin((imonth + 1. - 4.) * np.pi / 6.0) - md.smb.monthlytemperatures[md.mesh.numberofvertices, imonth] = ((imonth + 1) / 12.) md.smb.precipitation[0:md.mesh.numberofvertices, imonth] = precipitation - md.smb.precipitation[md.mesh.numberofvertices, imonth] = ((imonth + 1) / 12.) # time steps and resolution