ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/RcontribSimulManager.cpp
(Generate patch)

Comparing ray/src/rt/RcontribSimulManager.cpp (file contents):
Revision 2.4 by greg, Fri Nov 1 16:17:33 2024 UTC vs.
Revision 2.6 by greg, Wed Nov 6 18:28:52 2024 UTC

# Line 148 | Line 148 | RcontribSimulManager::RctCall(RAY *r, void *cd)
148  
149          int                     bi = 0; // get bin index
150          if (mp->binv) {
151 <                worldfunc(RCCONTEXT, r);        // compute bin #
151 >                worldfunc(RCCONTEXT, r);
152                  set_eparams(mp->params);
153                  double          bval = evalue(mp->binv);
154                  if (bval <= -.5)
# Line 324 | Line 324 | RcontribSimulManager::PrepOutput()
324                  error(INTERNAL, "PrepOutput() called before octree & modifiers assigned");
325                  return -1;
326          }
327 +        if (!cdsF) {
328 +                error(INTERNAL, "missing RdataShare constructor call (*cdsF)");
329 +                return -1;
330 +        }
331          if (lu_doall(&modLUT, checkModExists, NULL) < 0)
332                  return -1;
333  
# Line 796 | Line 800 | RcontribSimulManager::SetThreadCount(int nt)
800                  return 0;
801          }
802          if (nt < 0)
803 <                return nkids;
803 >                return NThreads();
804          if (!nt) nt = GetNCores();
805          int     status = 0;
806          if (nt == 1)
# Line 809 | Line 813 | RcontribSimulManager::SetThreadCount(int nt)
813                  sprintf(errmsg, "non-zero (%d) status from child", status);
814                  error(WARNING, errmsg);
815          }
816 <        return nkids;
816 >        return NThreads();
817   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)