Revision 1121

trunk/src/nh99/model.cpp (revision 1121)
140 140
    {
141 141
      if (withinbound(0,(varsptr[i])->phase_start,current_phase))
142 142
      {
143
	(varsptr[i])->dev_correction(H,ii);
143
        (varsptr[i])->dev_correction(H,ii);
144 144
      }
145 145
    }
146 146
    cout << H << endl << endl;
......
163 163
#  endif
164 164
          if (withinbound(0,(varsptr[i])->phase_start,current_phase))
165 165
          {
166
    	    nvar+= (varsptr[i])->size_count();
166
            nvar+= (varsptr[i])->size_count();
167 167
          }
168 168
#  if defined(USE_SHARE_FLAGS)
169 169
        }
......
180 180
      //if ((varsptr[i])->phase_start <= current_phase)
181 181
      if (withinbound(0,(varsptr[i])->phase_start,current_phase))
182 182
      {
183
	ntypes++;
183
        ntypes++;
184 184
      }
185 185
    }
186 186
    return ntypes;
......
192 192
    for (int i=0;i<num_initial_params;i++)
193 193
    {
194 194
      if (withinbound(0,(varsptr[i])->phase_start,current_phase))
195
	(varsptr[i])->sd_vscale(d,x,ii);
195
        (varsptr[i])->sd_vscale(d,x,ii);
196 196
    }
197 197
    return ii-1;
198 198
  }
......
204 204
    {
205 205
      //if ((varsptr[i])->phase_start <= current_phase)
206 206
      if (withinbound(0,(varsptr[i])->phase_start,current_phase))
207
	(varsptr[i])->sd_scale(d,x,ii);
207
        (varsptr[i])->sd_scale(d,x,ii);
208 208
    }
209 209
    return ii-1;
210 210
  }
......
216 216
    {
217 217
      //if ((varsptr[i])->phase_start <= current_phase)
218 218
      if (withinbound(0,(varsptr[i])->phase_start,current_phase))
219
	(varsptr[i])->curv_scale(d,x,ii);
219
        (varsptr[i])->curv_scale(d,x,ii);
220 220
    }
221 221
    return ii-1;
222 222
  }
trunk/src/nh99/cnstrs.cpp (revision 1121)
538 538
  //xtr = new doublereal[nx];
539 539
  xsc = new doublereal[_nx];
540 540
  fu = new doublereal[number3+1];
541
  fugrad = new doublereal[_nx*(number3+1)];	
541
  fugrad = new doublereal[_nx*(number3+1)];
542 542
  fud = new doublereal[(number3+1)*6];
543 543
}
544 544
gggg18::~gggg18()
......
631 631
}
632 632

  
633 633
#ifdef __cplusplus
634
	}
634
}
635 635
#endif
636 636

  
637 637
/*
......
787 787
}
788 788

  
789 789
#ifdef __cplusplus
790
	}
790
}
791 791
#endif
792 792

  
793 793
/**
trunk/src/nh99/evalxtrn.cpp (revision 1121)
10 10
 */
11 11
/* eval_extern.f -- translated by f2c (version 19950110).
12 12
   You must link the resultinumberv object file with the libraries:
13
	-lf2c -lm   (in that order)
13
     -lf2c -lm   (in that order)
14 14
*/
15 15
#include <admodel.h>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff