Revision 1971 trunk/src/nh99/mod_pmin.cpp

mod_pmin.cpp (revision 1971)
209 209
                new_value=current_value;
210 210
              }
211 211
            }
212
          if (!ad_comm::pvm_manager)
212
#if defined(USE_ADPVM)
213
          if (ad_comm::pvm_manager)
213 214
          {
215
            if (ad_comm::pvm_manager->mode==1) // master
216
            {
217
              send_int_to_slaves(3);
218
              pvm_master_prof_minimize(ip,sigma,new_value,fprof,underflow_flag,
219
                global_min,penalties(ip,j*sign),final_weight); // get the
220
            }
221
          }
222
          else
223
#endif
224
          {
214 225
            if (random_effects_flag==0)
215 226
            {
216 227
              prof_minimize(ip,sigma,new_value,fprof,underflow_flag,
......
224 235
                                                        // conditional max
225 236
            }
226 237
          }
227
          else
228
          {
229
#if defined(USE_ADPVM)
230
            if (ad_comm::pvm_manager->mode==1) // master
231
            {
232
              send_int_to_slaves(3);
233
              pvm_master_prof_minimize(ip,sigma,new_value,fprof,underflow_flag,
234
                global_min,penalties(ip,j*sign),final_weight); // get the
235
            }
236
#else
237
            {
238
              cerr << "PVM not included with this distribution" << endl;
239
              ad_exit(1);
240
            }
241
#endif
242
          }
243 238
          all_num_sigs(j*sign)=num_sigs;
244 239
          initial_params::xinit(xvector); // save the
245 240
          int ic=1;

Also available in: Unified diff