[26740] | 1 | Index: ../trunk-jpl/src/c/classes/Node.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/classes/Node.cpp (revision 26244)
|
---|
| 4 | +++ ../trunk-jpl/src/c/classes/Node.cpp (revision 26245)
|
---|
| 5 | @@ -790,7 +790,7 @@
|
---|
| 6 | /*}}}*/
|
---|
| 7 | int Node::FSize(void){/*{{{*/
|
---|
| 8 |
|
---|
| 9 | - _assert_(this && this->gdoflist);
|
---|
| 10 | + _assert_(this!=NULL && this->gdoflist);
|
---|
| 11 |
|
---|
| 12 | int fsize = 0;
|
---|
| 13 | for(int i=0;i<this->gsize;i++) if(this->f_set[i]) fsize++;
|
---|
| 14 | @@ -799,7 +799,7 @@
|
---|
| 15 | /*}}}*/
|
---|
| 16 | int Node::SSize(void){/*{{{*/
|
---|
| 17 |
|
---|
| 18 | - _assert_(this && this->s_set);
|
---|
| 19 | + _assert_(this!=NULL && this->s_set);
|
---|
| 20 |
|
---|
| 21 | int ssize = 0;
|
---|
| 22 | for(int i=0;i<this->gsize;i++) if(this->s_set[i]) ssize++;
|
---|
| 23 | Index: ../trunk-jpl/src/c/cores/love_core.cpp
|
---|
| 24 | ===================================================================
|
---|
| 25 | --- ../trunk-jpl/src/c/cores/love_core.cpp (revision 26244)
|
---|
| 26 | +++ ../trunk-jpl/src/c/cores/love_core.cpp (revision 26245)
|
---|
| 27 | @@ -130,7 +130,7 @@
|
---|
| 28 | int nt=nfreq/2/NTit;
|
---|
| 29 |
|
---|
| 30 | indf=d*nfreq+t*2*NTit;
|
---|
| 31 | - doubletype LoveM[NTit];
|
---|
| 32 | + doubletype* LoveM = xNew<doubletype>(NTit);
|
---|
| 33 |
|
---|
| 34 | for (int M=1;M<NTit+1;M++){
|
---|
| 35 | LoveM[M-1]=0.0;
|
---|
| 36 | @@ -857,10 +857,10 @@
|
---|
| 37 |
|
---|
| 38 | if(VerboseModule() && info!=0){
|
---|
| 39 | _printf0_("love core warning in DGESV : LAPACK linear equation solver couldn't resolve the system");
|
---|
| 40 | - printf("%s %s %s %s\n", "i","j","yi[i+nyi*j]","rhs[i]");
|
---|
| 41 | + _printf_("i j yi[i+nyi*j] rhs[i]");
|
---|
| 42 | for (int i=0;i<nyi;i++){
|
---|
| 43 | for (int j=0;j<nyi;j++){
|
---|
| 44 | - printf("%i %i %e %e\n", i,j,yi[i+nyi*j],rhs[i]);
|
---|
| 45 | + _printf_(i<<" "<<j<<" "<<yi[i+nyi*j]<<" "<<rhs[i]<<"\n");
|
---|
| 46 | }
|
---|
| 47 | }
|
---|
| 48 | }
|
---|