Changeset 25539 for issm/trunk-jpl/src/c/classes/IoModel.cpp
- Timestamp:
- 09/07/20 03:12:14 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk-jpl/src/c/classes/IoModel.cpp ¶
r25425 r25539 1700 1700 if(strcmp(iodata->name,vector_name)==0){ 1701 1701 _assert_(iodata->code==7); 1702 for( int i=0;i<elements->Size();i++){1703 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1702 for(Object* & object : elements->objects){ 1703 Element* element=xDynamicCast<Element*>(object); 1704 1704 element->InputCreate(iodata->data,inputs,this,iodata->M,iodata->N,iodata->layout,input_enum,iodata->code);//we need i to index into elements. 1705 1705 } … … 1721 1721 this->FetchData(&doublearray,&M,&N,vector_name); 1722 1722 1723 for( int i=0;i<elements->Size();i++){1724 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1723 for(Object* & object : elements->objects){ 1724 Element* element=xDynamicCast<Element*>(object); 1725 1725 if(!doublearray){ 1726 1726 element->SetElementInput(inputs,input_enum,default_value); … … 1742 1742 IoData* iodata=*iter; 1743 1743 if(strcmp(iodata->name,vector_name)==0){ 1744 for( int i=0;i<elements->Size();i++){1745 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1744 for(Object* & object : elements->objects){ 1745 Element* element=xDynamicCast<Element*>(object); 1746 1746 element->InputCreate(iodata->data,inputs,this,iodata->M,iodata->N,iodata->layout,input_enum,iodata->code);//we need i to index into elements. 1747 1747 } … … 1767 1767 case 1: //boolean constant 1768 1768 this->FetchData(&boolean,vector_name); 1769 for( i=0;i<elements->Size();i++){1770 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1769 for(Object* & object : elements->objects){ 1770 Element* element=xDynamicCast<Element*>(object); 1771 1771 element->SetBoolInput(inputs,input_enum,boolean); 1772 1772 } … … 1774 1774 case 2: //integer constant 1775 1775 this->FetchData(&integer,vector_name); 1776 for( i=0;i<elements->Size();i++){1777 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1776 for(Object* & object : elements->objects){ 1777 Element* element=xDynamicCast<Element*>(object); 1778 1778 element->SetIntInput(inputs,input_enum,integer); 1779 1779 } … … 1781 1781 case 3: //IssmDouble constant 1782 1782 this->FetchData(&scalar,vector_name); 1783 for( i=0;i<elements->Size();i++){1784 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1783 for(Object* & object : elements->objects){ 1784 Element* element=xDynamicCast<Element*>(object); 1785 1785 element->SetElementInput(inputs,input_enum,scalar); 1786 1786 } … … 1789 1789 this->FetchData(&doublearray,&M,&N,vector_name); //we still have a doublearray, because it might include times in transient mode 1790 1790 if(!doublearray) _error_("\""<<vector_name<<"\" not found in binary file"); 1791 for( i=0;i<elements->Size();i++){1792 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1791 for(Object* & object : elements->objects){ 1792 Element* element=xDynamicCast<Element*>(object); 1793 1793 element->InputCreate(doublearray,inputs,this,M,N,vector_layout,input_enum,code);//we need i to index into elements. 1794 1794 } … … 1797 1797 this->FetchData(&doublearray,&M,&N,vector_name); //we still have a doublearray, because it might include times in transient mode 1798 1798 if(!doublearray) _error_("\""<<vector_name<<"\" not found in binary file"); 1799 for( i=0;i<elements->Size();i++){1800 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1799 for(Object* & object : elements->objects){ 1800 Element* element=xDynamicCast<Element*>(object); 1801 1801 element->InputCreate(doublearray,inputs,this,M,N,vector_layout,input_enum,code);//we need i to index into elements. 1802 1802 } … … 1828 1828 //initialize transient input dataset: 1829 1829 TransientInput* transientinput=inputs->SetDatasetTransientInput(input_enum,i, times,N); 1830 for( int j=0;j<elements->Size();j++){1830 for(Object* & object : elements->objects){ 1831 1831 1832 1832 /*Get the right transient input*/ 1833 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(j));1833 Element* element=xDynamicCast<Element*>(object); 1834 1834 1835 1835 /*Get values and lid list*/ … … 1899 1899 this->FetchData(&doublearray,&M,&N,vector_name); 1900 1900 if(!doublearray) _error_("\""<<vector_name<<"\" not found in binary file"); 1901 for( i=0;i<elements->Size();i++){1902 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1901 for(Object* & object : elements->objects){ 1902 Element* element=xDynamicCast<Element*>(object); 1903 1903 element->InputCreate(doublearray,inputs,this,M,N,vector_layout,input_enum,code);//we need i to index into elements. 1904 1904 } … … 1919 1919 IoData* iodata=*iter; 1920 1920 if(strcmp(iodata->name,vector_name)==0){ 1921 for( int i=0;i<elements->Size();i++){1922 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1921 for(Object* & object : elements->objects){ 1922 Element* element=xDynamicCast<Element*>(object); 1923 1923 _error_("to be implemented..."); 1924 1924 //element->InputCreate(iodata->data,inputs,this,iodata->M,iodata->N,iodata->layout,input_enum,iodata->code);//we need i to index into elements. … … 1960 1960 for(int i=0;i<N;i++) ids[i] = i; 1961 1961 1962 for( int i=0;i<elements->Size();i++){1963 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1962 for(Object* & object : elements->objects){ 1963 Element* element=xDynamicCast<Element*>(object); 1964 1964 element->DatasetInputCreate(doublearray,M,N,ids,N,inputs,this,input_enum); 1965 1965 } … … 1975 1975 for(int i=0;i<N;i++) ids[i] = i; 1976 1976 1977 for( int i=0;i<elements->Size();i++){1978 Element* element=xDynamicCast<Element*>( elements->GetObjectByOffset(i));1977 for(Object* & object : elements->objects){ 1978 Element* element=xDynamicCast<Element*>(object); 1979 1979 element->DatasetInputCreate(doublearray,M,N,ids,N,inputs,this,input_enum); 1980 1980 }
Note:
See TracChangeset
for help on using the changeset viewer.