Revision 785

branches/pthreads-737/src/nh99/model7.cpp (revision 785)
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 233
      (*ad_printf)( " -noinit         do not initialize RE before inner optimization\n");
233 234
      (*ad_printf)( " -ndi N          set maximum number of separable calls\n");
234 235
      (*ad_printf)( " -ndb N          set number of blocks for RE derivatives (reduce temp file size)\n");
......
582 583
  }
583 584
}
584 585

  
585
/*
586 586
#else if defined(USE_PTHREADS)
587 587

  
588 588
void add_slave_suffix(const adstring& _tmpstring)
589 589
{
590 590
  ADUNCONST(adstring,tmpstring)
591
  if (ad_comm::pthreads_manager)
591
  if (ad_comm::pthread_manager)
592 592
  {
593
    if (ad_comm::pthreads_manager->is_slave())
593
    if (ad_comm::pthread_manager->is_slave())
594 594
    {
595
       tmpstring += "_";
596
       tmpstring += str(ad_comm::pthread_manager->get_slave_number());
597
       cout << "In slave " << tmpstring << endl;
598
    }
599
    else
600
    {
601
       tmpstring += "_master";
602
       cout << "In master " << tmpstring << endl;
603
    }
604
  }
605
  cout << "ad_comm::pthread_manager " << endl;
606
  cout << ad_comm::pthread_manager << endl;
607
  if (ad_comm::pthread_manager)
608
  {
609
    if (ad_comm::pthread_manager->is_slave())
610
    {
595 611
      tmpstring += "_";
596
      tmpstring += str(ad_comm::pthreads_manager->get_slave_number());
612
      tmpstring += str(ad_comm::pthread_manager->get_slave_number());
597 613
       cout << "In slave " << tmpstring << endl;
598 614
    }
599 615
    else
......
603 619
    }
604 620
  }
605 621
}
606
*/
607 622
#endif
branches/pthreads-737/src/linad99/adglobl.cpp (revision 785)
17 17
 adtimer * ad_comm::ptm1=0;
18 18
 int ad_comm::bandwidth=0;
19 19
 adpvm_manager * ad_comm::pvm_manager=NULL;
20
 __ADMBTHREAD__ adpthreads_manager * ad_comm::pthreads_manager=0;
21
 __ADMBTHREAD__ int  adpthreads_manager::slave_number=0;
20
 __ADMBTHREAD__ adpthread_manager * ad_comm::pthread_manager=0;
21
 __ADMBTHREAD__ int  adpthread_manager::slave_number=0;
22 22

  
23 23
 int ad_comm::time_flag=0;
24 24
 adstring ad_comm::subdir;
branches/pthreads-737/src/linad99/fvar.hpp (revision 785)
8078 8078
  adstring get_string_marker(void);
8079 8079
  class adpvm_manager;
8080 8080
  class adtimer;
8081

  
8081
  /*
8082 8082
  class adpthreads_manager
8083 8083
  {
8084 8084
    static __ADMBTHREAD__ int slave_number;
......
8096 8096
    adpthreads_manager(int n) { slave_number=n;}
8097 8097
    adpthreads_manager(void) { slave_number=0;}
8098 8098
  };
8099
  */
8099 8100

  
8101
  // ******************************************************
8102
  // ******************************************************
8103
  // ******************************************************
8104
  // ******************************************************
8105
  class thread_data;
8106

  
8107
  class adpthread_manager
8108
  {
8109
    static __ADMBTHREAD__ int slave_number;
8110
  public:
8111
    static int is_slave(void) { if (slave_number)
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff