Revision 1110 trunk/src/df1b2-separable/df1b2f28.cpp

df1b2f28.cpp (revision 1110)
31 31

  
32 32
  double dfx= yu*xpy1;
33 33
  double dfy= zu*logx;
34
  double dfxx=yy1*xpy2; 
34
  double dfxx=yy1*xpy2;
35 35
  double dfxy=xpy1*(1.0+yu*logx);
36 36
  double dfyy=dfy*logx;
37 37
  double dfxxx=yy1*y2*xpy3;
......
47 47
  {
48 48
    *zd++ = dfx * *xd++ + dfy * *yd++;
49 49
  }
50
      
50

  
51 51
  f1b2gradlist->write_pass1(&x,&y,&z,
52 52
    dfx,
53 53
    dfy,
54 54
    dfxx,dfxy,dfyy,
55
    dfxxx,dfxxy,dfxyy,dfyyy); 
55
    dfxxx,dfxxy,dfxyy,dfyyy);
56 56
  return z;
57 57
}
58 58

  
......
79 79
  {
80 80
    *zd++ =  dfy * *yd++;
81 81
  }
82
      
82

  
83 83
  f1b2gradlist->write_pass1(&y,&z,
84 84
    dfy,
85 85
    dfyy,
86
    dfyyy); 
86
    dfyyy);
87 87
  return z;
88 88
}
89 89

  
......
120 120
  {
121 121
    *zd++ = dfx * *xd++ + dfy * *yd++;
122 122
  }
123
      
123

  
124 124
  f1b2gradlist->write_pass1(&x,&y,&z,
125 125
    dfx,
126 126
    dfy,
127 127
    dfxx,dfxy,dfyy,
128
    dfxxx,dfxxy,dfxyy,dfyyy); 
128
    dfxxx,dfxxy,dfxyy,dfyyy);
129 129
  return z;
130 130
}
131 131

  
......
157 157
  {
158 158
    *zd++ =  dfy * *yd++;
159 159
  }
160
      
160

  
161 161
  f1b2gradlist->write_pass1(&y,&z,
162 162
    dfy,
163 163
    dfyy,
164
    dfyyy); 
164
    dfyyy);
165 165
  return z;
166 166
}
167 167

  
......
186 186
  {
187 187
    *zd++ = dfx * *xd++ ;
188 188
  }
189
      
189

  
190 190
  f1b2gradlist->write_pass1(&x,&z,
191 191
    dfx,
192 192
    dfxx,
......
202 202
  *z.get_u()=xu*xu
203 203
  double zu=*z.get_u();
204 204

  
205
  double dfx=2.0*xu 
206
  double dfxx=2.0; 
205
  double dfx=2.0*xu
206
  double dfxx=2.0;
207 207
  double dfxxx=0.0;
208 208
  double * xd=x.get_u_dot();
209 209
  double * zd=z.get_u_dot();
......
212 212
  {
213 213
    *zd++ = dfx * *xd++ ;
214 214
  }
215
      
215

  
216 216
  f1b2gradlist->write_pass1(&x,&z,
217 217
    dfx,
218 218
    dfxx,

Also available in: Unified diff