Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20242 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Apr 23, 2014
1 parent f3cfdd2 commit dc89026
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions Compiler/Template/CodegenCpp.tpl
Expand Up @@ -7243,12 +7243,12 @@ template daeExpCall(Exp call, Context context, Text &preExp /*BUFP*/,
let arrayType = expTypeArray(ty)
let dimstr = listLength(crefSubs(cr))
let tmp = tempDecl('multi_array<<%arrayType%>,<%dimstr%>>', &varDecls /*BUFD*/)

// let arr_tp_str = '<%expTypeFromExpArray(A)%>'
//let tvar = tempDecl(arr_tp_str, &varDecls /*BUFD*/)
let &preExp += 'promote_array(<%var2%>,<%var1%>, <%tmp%>);<%\n%>'


'<%tmp%> '
else
'promote array error'
Expand Down Expand Up @@ -7719,7 +7719,7 @@ template daeExpCrefRhsIndexSpec(list<Subscript> subs, Context context,
let tmp_index = tempDecl("vector<size_t>", &varDecls /*BUFD*/)
let &preExp += '<%tmp_index%>.push_back(1);<%\n%>
<%tmp%>.push_back(<%tmp_index%>);<%\n%>'
''
''
case SLICE(__) then
let tmp_index = tempDecl("vector<size_t>", &varDecls /*BUFD*/)
let expPart = daeExp(exp, context, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode)
Expand Down Expand Up @@ -8955,7 +8955,7 @@ template expTypeFromExpFlag(Exp exp, Integer flag)
case c as RANGE(__)
case c as CAST(__)
case c as CREF(__)
case c as CODE(__) then expTypeFlag(c.ty, flag)
case c as CODE(__) then expTypeFlag(c.ty, flag)
case ASUB(__) then expTypeFromExpFlag(exp, flag)
case REDUCTION(__) then expTypeFlag(typeof(exp), flag)
case BOX(__)
Expand Down
12 changes: 6 additions & 6 deletions SimulationRuntime/cpp/Include/Core/Math/ArrayOperations.h
Expand Up @@ -185,7 +185,7 @@ Applies array operation F (*,/) on one dimensional array
template<
typename T, class F
>
boost::multi_array< T, 1 > array_operation( boost::multi_array< T, 1 > a, boost::multi_array_ref< T, 1 > b, F& op )
boost::multi_array< T, 1 > array_operation( boost::multi_array< T, 1 > a, boost::multi_array_ref< T, 1 > b, F& op )
{
typename boost::multi_array_ref< T, 1 >::iterator j = b.begin();
for ( typename boost::multi_array< T, 1 >::iterator i = a.begin();
Expand Down Expand Up @@ -270,7 +270,7 @@ boost::detail::multi_array::sub_array< T, dims > array_operation( boost::detail:
return a;
}
/**
Applies array operation F (+,-) on array
Applies array operation F (+,-) on array
*/

template<
Expand Down Expand Up @@ -420,7 +420,7 @@ void transpose_array (boost::multi_array< T, 2 >& a, boost::multi_array< T, 2 >
const size_t* shape = x.shape();
vector<size_t> ex;
ex.assign( shape, shape+x.num_dimensions() );
std::swap( ex[0], ex[1] );
std::swap( ex[0], ex[1] );
a.resize(ex);
a.reindex(1);
T* data = x.data();
Expand Down Expand Up @@ -453,9 +453,9 @@ void create_array_from_shape(const vector<vector<size_t> >& sp,boost::multi_arra
data[i] = source_data[index];
i++;
}

}

d.assign( data, data + d.num_elements() );
delete [] data;
}
Expand All @@ -473,7 +473,7 @@ void promote_array(unsigned int n,boost::multi_array< T, NumDims >& s,boost::mul
T* data = s.data();
d.assign( data, data + d.num_elements() );
}

/**
finds min/max elements of an array */
template < typename T, size_t NumDims >
Expand Down

0 comments on commit dc89026

Please sign in to comment.