Changeset 36532

Timestamp:

Feb 18, 2014, 2:49:51 PM (12 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20140206/Ohana/src/opihi

Files:

• . (modified) (1 prop)
• cmd.astro (modified) (1 prop)
• cmd.data (modified) (1 prop)
• dvo/dvo_client.c (modified) (1 diff)
• lib.shell/stack_math.c (modified) (3 diffs)
• pcontrol/CheckBusyJob.c (modified) (1 diff)

branches/eam_branches/ipp-20140206/Ohana/src/opihi/dvo/dvo_client.c

@@ -90 +90 @@
   }
 
+  // these are set in 'startup.c' for readline-based programs
+  set_variable ("PID", getpid());
+  set_str_variable ("KAPA", "kapa");
+  set_int_variable ("UNSIGN", 0);
+  gfits_set_unsign_mode (FALSE);
+
   return;
 }

branches/eam_branches/ipp-20140206/Ohana/src/opihi/lib.shell/stack_math.c

@@ -1125 +1125 @@
   if (!strcmp (op, "floor"))  S_FUNC(floor (M1), ST_SCALAR_FLT);
   if (!strcmp (op, "ceil"))   S_FUNC(ceil (M1), ST_SCALAR_FLT);
-  if (!strcmp (op, "rint"))   S_FUNC(nearbyint (M1), ST_SCALAR_FLT);
+  // if (!strcmp (op, "rint"))   S_FUNC(nearbyint (M1), ST_SCALAR_FLT);
   if (!strcmp (op, "exp"))    S_FUNC(exp (M1), ST_SCALAR_FLT);
   if (!strcmp (op, "ten"))    S_FUNC(pow (10.0,M1), ST_SCALAR_FLT);
@@ -1207 +1207 @@
   if (!strcmp (op, "floor"))  V_FUNC(floor (*M1), ST_SCALAR_FLT);
   if (!strcmp (op, "ceil"))   V_FUNC(ceil (*M1), ST_SCALAR_FLT);
-  if (!strcmp (op, "rint"))   V_FUNC(nearbyint (*M1), ST_SCALAR_FLT);
+  // if (!strcmp (op, "rint"))   V_FUNC(nearbyint (*M1), ST_SCALAR_FLT);
   if (!strcmp (op, "exp"))    V_FUNC(exp(*M1), ST_SCALAR_FLT);
   if (!strcmp (op, "ten"))    V_FUNC(pow(10.0,*M1), ST_SCALAR_FLT);
@@ -1282 +1282 @@
   if (!strcmp (op, "floor")) { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = floor (*M1); }}
   if (!strcmp (op, "ceil"))  { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = ceil (*M1); }}
-  if (!strcmp (op, "rint"))  { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = nearbyint (*M1); }}
+  // if (!strcmp (op, "rint"))  { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = nearbyint (*M1); }}
 
   if (!strcmp (op, "exp"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = exp(*M1);          }}

branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/CheckBusyJob.c

@@ -99 +99 @@
 
   // XXX runaway job if output too large?
-  if (job[0].stdout_buf.size > 0x1000000) abort();
-  if (job[0].stderr_buf.size > 0x1000000) abort();
+  if (job[0].stdout_buf.size > 0x10000000) abort();
+  if (job[0].stderr_buf.size > 0x10000000) abort();
 
   // job has exited : move to DONE stack