Revision 810

branches/pthreads-737/src/nh99/model7.cpp (revision 810)
229 229
      (*ad_printf)( " -hbf            set the hybrid bounded flag for bounded parameters\n");
230 230
      (*ad_printf)( " -hyeps          mean step size for hybrid Monte Carlo\n");
231 231
      (*ad_printf)( " -hynstep        number of steps for hybrid Monte Carlo\n");
232
      //ad_printf)( " -noreders       turn off re's for derivative calcs for std devs\n");
232
   // (*ad_printf)( " -noreders       turn off re's for derivative calcs for std devs\n");
233 233
      (*ad_printf)( " -noinit         do not initialize RE before inner optimization\n");
234 234
      (*ad_printf)( " -ndi N          set maximum number of separable calls\n");
235 235
      (*ad_printf)( " -ndb N          set number of blocks for RE derivatives (reduce temp file size)\n");
......
592 592
  {
593 593
    if (ad_comm::pthread_manager->is_slave())
594 594
    {
595
       tmpstring += "_";
596
       tmpstring += str(ad_comm::pthread_manager->get_slave_number());
595
      tmpstring += "_";
596
      tmpstring += str(ad_comm::pthread_manager->get_slave_number());
597 597
       cout << "In slave " << tmpstring << endl;
598 598
    }
599 599
    else
600 600
    {
601
       tmpstring += "_master";
601
      tmpstring += "_master";
602 602
       cout << "In master " << tmpstring << endl;
603 603
    }
604 604
  }
branches/pthreads-737/src/linad99/jacob2.cpp (revision 810)
136 136
    // position the cmpdif file correctly;
137 137
    if (last_cpos)
138 138
    {
139
      int cmp_lpos=DEPVARS_INFO->cmpdif_file_position(ijac);
139
      my_off_t cmp_lpos=DEPVARS_INFO->cmpdif_file_position(ijac);
140
      //int cmp_lpos=DEPVARS_INFO->cmpdif_file_position(ijac);
140 141
      lseek(fp->file_ptr,cmp_lpos,SEEK_SET);
141 142
      #if !defined(__MSVC32__) && !defined(__GNUDOS__) && !defined (__WAT32__)
142 143
        fp->read_cmpdif_stack_buffer(cmp_lpos);
143 144
      #else
144
        fp->read_cmpdif_stack_buffer((long int&)cmp_lpos);
145
        fp->read_cmpdif_stack_buffer(cmp_lpos);
146
        //fp->read_cmpdif_stack_buffer((long int&)cmp_lpos);
145 147
      #endif
146 148
    }
147 149
    GRAD_STACK1->_GRADFILE_PTR = GRAD_STACK1->gradfile_handle();
branches/pthreads-737/src/linad99/gst_read.cpp (revision 810)
75 75
#     if defined(__GNU__)
76 76
  int  grad_stack::read_grad_stack_buffer(my_off_t& lpos)
77 77
#     else
78
  int  grad_stack::read_grad_stack_buffer(long int& lpos)
78
  int  grad_stack::read_grad_stack_buffer(my_off_t& lpos)
79 79
#     endif
80 80
  {
81 81
    // check to see if we are past the beginning of this file
branches/pthreads-737/src/linad99/xgradclc.cpp (revision 810)
91 91
  gradient_structure::TOTAL_BYTES = 0;
92 92
  gradient_structure::PREVIOUS_TOTAL_BYTES=0;
93 93
  unsigned int i;
94
  long int lpos;
94
  my_off_t lpos;
95 95
  if(!gradient_structure::instances)
96 96
  {
97 97
    return;
......
206 206
   if (lpos<0) 
207 207
   {  
208 208
     #ifdef GRAD_DIAG
209
      long int ttmp = 
209
      my_pos_t ttmp = 
210 210
     #endif
211 211
      lseek(gradient_structure::GRAD_STACK1->_GRADFILE_PTR, 0,SEEK_CUR);
212 212

  
branches/pthreads-737/src/linad99/fvar.hpp (revision 810)
119 119
  #define __ADMBTHREAD__
120 120
#endif
121 121

  
122
#define my_off_t long int
122
#define my_off_t long long int
123 123
#ifdef __BORLANDC__
124 124
#define my_u_off_t unsigned long int
125 125
#else
......
8078 8078
  adstring get_string_marker(void);
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff