← Back to branch summary

~ubuntu-branches/ubuntu/raring/rheolef/raring-proposed

« back to all changes in this revision

Viewing changes to nfem/plib/space_constant.cc

  • Committer: Package Import Robot
  • Author(s): Pierre Saramito, Pierre Saramito, Sylvestre Ledru
  • Date: 2012-05-14 14:02:09 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120514140209-dzbdlidkotyflf9e
Tags: 6.1-1
http://bugs.debian.org/671996
[ Pierre Saramito ]
* New upstream release 6.1 (minor changes):
  - support arbitrarily polynomial order Pk
  - source code supports g++-4.7 (closes: #671996)

[ Sylvestre Ledru ]
* update of the watch file

Show diffs side-by-side

added added

removed removed

Lines of Context:
nfem/plib/space_constant.cc
96
96
        { 3, 4, 5}
97
97
};
98
98
static
99
 
std::pair<size_type,size_type>
100
 
symmetric_tensor_subscript [6] = {
101
 
        {0,0},
102
 
        {0,1},
103
 
        {1,1},
104
 
        {0,2},
105
 
        {1,2},
106
 
        {2,2}
107
 
};
108
 
static
109
99
const char*
110
100
symmetric_tensor_subscript_name [6] = {
111
101
        "00", 
123
113
        { 6, 7, 8}
124
114
};
125
115
static
126
 
std::pair<size_type,size_type>
127
 
unsymmetric_tensor_subscript [9] = {
128
 
        {0,0},
129
 
        {0,1}, 
130
 
        {1,0},
131
 
        {1,1},
132
 
        {0,2},
133
 
        {1,2},
134
 
        {2,0},
135
 
        {2,1},
136
 
        {2,2}
137
 
};
138
 
static
139
116
const char*
140
117
unsymmetric_tensor_subscript_name [9] = {
141
118
        "00",
148
125
        "21",   
149
126
        "22"
150
127
};
 
128
#ifdef _RHEOLEF_HAVE_CONSTANT_BRACES_INITIALIZER
 
129
static
 
130
std::pair<size_type,size_type>
 
131
symmetric_tensor_subscript [6] = {
 
132
        {0,0},
 
133
        {0,1},
 
134
        {1,1},
 
135
        {0,2},
 
136
        {1,2},
 
137
        {2,2}
 
138
};
 
139
static
 
140
std::pair<size_type,size_type>
 
141
unsymmetric_tensor_subscript [9] = {
 
142
        {0,0},
 
143
        {0,1},
 
144
        {1,0},
 
145
        {1,1},
 
146
        {0,2},
 
147
        {1,2},
 
148
        {2,0},
 
149
        {2,1},
 
150
        {2,2}
 
151
};
 
152
#else // ! _RHEOLEF_HAVE_CONSTANT_BRACES_INITIALIZER
 
153
// intel C++ v12 cannot support class initializers:
 
154
static std::pair<size_type,size_type>   symmetric_tensor_subscript [6];
 
155
static std::pair<size_type,size_type> unsymmetric_tensor_subscript [9];
 
156
struct static_initializer_t {
 
157
  static_initializer_t();
 
158
};
 
159
static_initializer_t::static_initializer_t() {
 
160
  typedef std::pair<size_type,size_type> p;
 
161
    symmetric_tensor_subscript[0] = p(0,0);
 
162
    symmetric_tensor_subscript[1] = p(0,1);
 
163
    symmetric_tensor_subscript[2] = p(1,1);
 
164
    symmetric_tensor_subscript[3] = p(0,2);
 
165
    symmetric_tensor_subscript[4] = p(1,2);
 
166
    symmetric_tensor_subscript[5] = p(2,2);
 
167
 
 
168
  unsymmetric_tensor_subscript[0] = p(0,0);
 
169
  unsymmetric_tensor_subscript[1] = p(0,1);
 
170
  unsymmetric_tensor_subscript[2] = p(1,0);
 
171
  unsymmetric_tensor_subscript[3] = p(1,1);
 
172
  unsymmetric_tensor_subscript[4] = p(0,2);
 
173
  unsymmetric_tensor_subscript[5] = p(1,2);
 
174
  unsymmetric_tensor_subscript[6] = p(2,0);
 
175
  unsymmetric_tensor_subscript[7] = p(2,1);
 
176
  unsymmetric_tensor_subscript[8] = p(2,2);
 
177
}
 
178
static static_initializer_t dummy;
 
179
 
 
180
#endif // _RHEOLEF_HAVE_CONSTANT_BRACES_INITIALIZER
151
181
size_type
152
182
n_component (
153
183
    valued_type        valued_tag,