<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">I tried revert on this file (which I did not touch) iga.c but got a message to try 'hg revert help' ... which was no help.<div><br></div><div>So I just went ahead and committed the whole thing and and that cleared it up. I've appended the diffs, but as I said I've never touched this file. Hope I didn't clobber someones stuff,</div><div><br></div><div>Mark</div><div><br></div><div><div>diff -r 4bf480f9a778 src/dm/impls/iga/iga.c</div><div>--- a/src/dm/impls/iga/iga.c Wed Aug 24 17:08:17 2011 -0700</div><div>+++ b/src/dm/impls/iga/iga.c Wed Aug 24 17:43:52 2011 -0700</div><div>@@ -1555,24 +1555,22 @@</div><div> #define __FUNCT__ "CreateKnotVector"</div><div> PetscErrorCode CreateKnotVector(PetscInt N,PetscInt p,PetscInt C,PetscInt m, PetscReal *U,PetscReal U0,PetscReal Uf)</div><div> {</div><div>- PetscInt i,j;</div><div>+ PetscInt i,j;</div><div> PetscReal dU;</div><div>- PetscInt k0;</div><div> </div><div> PetscFunctionBegin;</div><div>- for(i=0;i<p+1;i++) /* open part */</div><div>+</div><div>+ dU = (Uf-U0)/N;</div><div>+ for(i=0;i<(N-1);i++) /* insert N-1 knots */</div><div>+ for(j=0;j<(p-C);j++) /* p-C times */</div><div>+ U[(p+1) + i*(p-C) + j] = U0 + (i+1)*dU;</div><div>+</div><div>+ for(i=0;i<(p+1);i++) /* open part */</div><div> {</div><div> U[i] = U0;</div><div> U[m-i-1] = Uf;</div><div> }</div><div> </div><div>- dU = (Uf-U0)/((PetscReal) N);</div><div>- k0 = p+1;</div><div>- for(i=0;i<(N-1);i++) /* insert N-1 knots */</div><div>- {</div><div>- for(j=0;j<(p-C);j++) /* p-C+1 times */</div><div>- U[k0 + i*(p-C) + j] = U0+((PetscReal) (i+1))*dU;</div><div>- }</div><div> PetscFunctionReturn(0);</div><div> }</div><div> </div><div>@@ -1580,29 +1578,22 @@</div><div> #define __FUNCT__ "CreatePeriodicKnotVector"</div><div> PetscErrorCode CreatePeriodicKnotVector(PetscInt N,PetscInt p,PetscInt C,PetscInt m, PetscReal *U,PetscReal U0,PetscReal Uf)</div><div> {</div><div>- PetscInt i,j;</div><div>+ PetscInt i,j;</div><div> PetscReal dU;</div><div>- PetscInt k0;</div><div> </div><div>- PetscFunctionBegin; /* periodic part */</div><div>- U[p] = U0;</div><div>- U[m-p-1] = Uf;</div><div>+ PetscFunctionBegin;</div><div> </div><div>- dU = (Uf-U0)/((PetscReal) N);</div><div>- k0 = p+1;</div><div>- for(i=0;i<(N-1);i++) /* insert N-1 knots */</div><div>+ dU = (Uf-U0)/N;</div><div>+ for(i=0;i<(N+1);i++) /* insert N+1 knots */</div><div>+ for(j=0;j<(p-C);j++) /* p-C times */</div><div>+ U[(C+1) + i*(p-C) + j] = U0 + i*dU;</div><div>+</div><div>+ for(i=0;i<(C+1);i++) /* periodic part */</div><div> {</div><div>- for(j=0;j<(p-C);j++) /* p-C+1 times */</div><div>- U[k0 + i*(p-C) + j] = U0+((PetscReal) (i+1))*dU;</div><div>+ U[i] = U0 - (Uf - U[(m-1-p)-(C+1)+i]);</div><div>+ U[m-(C+1)+i] = Uf + (U[p+1+i] - U0);</div><div> }</div><div> </div><div>- for(i=0;i<p;i++)</div><div>- {</div><div>- U[i] = -U[m-p-1]+U[m-p-1-(p-i)];</div><div>- U[m-p+i] = U[m-p-1]+U[p+i+1];</div><div>- }</div><div>-</div><div>-</div><div> PetscFunctionReturn(0);</div><div> }</div></div><div><br></div><div><br></div><div><br><div><div>On Aug 24, 2011, at 8:45 PM, Jed Brown wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div class="gmail_quote">On Wed, Aug 24, 2011 at 19:16, Mark F. Adams <span dir="ltr"><<a href="mailto:mark.adams@columbia.edu">mark.adams@columbia.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div id=":310">I'm stuck. I seem to have some file that I know nothing about:<br>
<br>
examples/tutorials> hg status -m<br>
M src/dm/impls/iga/iga.c<br>
<br>
that seems to be holding me up from doing just about anything with hg. I've tried reverting it with not luck.</div></blockquote></div><br><div>hg diff -- to see if there is anything you want to keep</div><div>hg revert src/dm/impls/iga/iga.c -- to discard those changes</div>
<div>hg update -C -- to discard any changes in the current working tree and update to the given revision (tip, by default)</div><div><br></div><div>If you have a problem with these, paste the full output.</div>
</blockquote></div><br></div></body></html>