[petsc-dev] src/ts/examples/tutorials/ex19adj.c missing?

Barry Smith bsmith at mcs.anl.gov
Wed Apr 15 21:12:28 CDT 2015


  Satish, just take them out of the makefile in master

> On Apr 15, 2015, at 9:06 PM, Hong Zhang <hongzhang at anl.gov> wrote:
> 
> Hi Satish,
> 
> I did not intend to add these files in this commit. Can you please help me get rid of 
> 
> ex19adj: ex19adj.o  chkopts
>        -${CLINKER} -o ex19adj ex19adj.o  ${PETSC_TS_LIB}
>        ${RM} ex19adj.o
> 
> ex19opt_ic: ex19opt_ic.o chkopts
>        -${CLINKER} -o ex19opt_ic ex19opt_ic.o ${PETSC_TS_LIB}
>        ${RM} ex19opt_ic.o
> 
> in the src/ts/examples/tutorials/makefile? Or should I create a new pull request to fix it? 
> 
> Thanks,
> Hong
> 
> On Apr 14, 2015, at 1:49 PM, Satish Balay <balay at mcs.anl.gov> wrote:
> 
>> Perhaps Hong didn't include these files in the commit. cc:ing Hong.
>> 
>> I see the commit was merged via branch barry/petsc-sa-refactor-rebase
>> 
>> $ git log --ancestry-path --reverse --merges e468013211bb8e2e81ded0f6b4ec8e550e081d7e..master
>> commit 3188f603bf47e22bf58a6ef813d382ac5f05ad97
>> Merge: 9d414b0 3940827
>> Author: Barry Smith <bsmith at mcs.anl.gov>
>> Date:   Mon Feb 9 17:04:15 2015 -0600
>> 
>>   Merge branch 'barry/petsc-sa-refactor-rebase'
>> 
>> ...
>> 
>> Satish
>> 
>> On Tue, 14 Apr 2015, Dominic Meiser wrote:
>> 
>>> On 04/14/2015 12:11 PM, Satish Balay wrote:
>>>> Hm - I don't see this file in the commit mentioned..
>>> That's correct, they're not being added in that commit. However, the files are
>>> needed by targets added to the makefile in this commit. That's why I was
>>> thinking that perhaps they should have been added in that commit?
>>> 
>>> Dominic
>>>> 
>>>> Satish
>>>> -----
>>>> 
>>>> balay at asterix /home/balay/petsc (master=)
>>>> $ git show --stat e468013211
>>>> commit e468013211bb8e2e81ded0f6b4ec8e550e081d7e
>>>> Author: Hong Zhang <hongzhang at anl.gov>
>>>> Date:   Sun Nov 23 08:19:16 2014 -0600
>>>> 
>>>>    change names for the quadrature term in the cost function
>>>> 
>>>> include/petsc-private/tsimpl.h     |  2 +-
>>>> include/petscts.h                  |  4 ++--
>>>> src/ts/examples/tutorials/makefile | 16 +++++++++++++---
>>>> src/ts/interface/ts.c              | 22 +++++++++++-----------
>>>> 4 files changed, 27 insertions(+), 17 deletions(-)
>>>> balay at asterix /home/balay/petsc (master=)
>>>> $ git log --follow -- src/ts/examples/tutorials/ex19adj.c
>>>> balay at asterix /home/balay/petsc (master=)
>>>> $
>>>> 
>>>> On Tue, 14 Apr 2015, Dominic Meiser wrote:
>>>> 
>>>>> Hi,
>>>>> 
>>>>> Is it possible that src/ts/examples/tutorials/ex19adj.c and
>>>>> src/ts/examples/tutorials/ex19opt_ic.c are missing from the repo? I
>>>>> believe
>>>>> these should have been added in commit e468013211.
>>>>> 
>>>>> Cheers,
>>>>> Dominic
>>>>> 
>>>>> 
>>>> 
>>> 
>>> 
>>> 
>> 
> 




More information about the petsc-dev mailing list