Changeset 981f775


Ignore:
Timestamp:
12/11/10 01:21:28 (3 years ago)
Author:
Oleg Batrashev <ogbash@…>
Branches:
master, external, fix-prolong, refactor, refactor-subsolvers
Children:
b77a46f
Parents:
72b1866
git-author:
Oleg Batrashev <ogbash@…> (12/11/10 01:21:28)
git-committer:
Oleg Batrashev <ogbash@…> (12/11/10 01:21:28)
Message:

Make tests work after renaming.

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r7365bb8 r981f775  
    2222/src/main/Make.deps 
    2323/src/main/doug_aggr 
    24 /src/main/doug_main 
    25 /src/main/doug_main-main_drivers.obj 
     24/src/main/doug_geom 
     25/src/main/doug_geom-main_drivers.obj 
    2626/src/matrix_gen 
    2727 

  • scripts/conf/hebe/tests.conf

    r7365bb8 r981f775  
    2828#  levels=1,2,3 
    2929#  processors=1,4 
    30 #  executables=doug_main,doug_aggr 
     30#  executables=doug_geom,doug_aggr 
    3131#  smoothers = 0,1,2 
    3232[tests] 
    … …  
    4545levels=1,2 
    4646#levels=1 
    47 executables=%(g-dougdir)s/doug_main 
     47executables=%(g-dougdir)s/doug_geom 
    4848smoothers = 0 
    4949 

  • scripts/conf/kheiron/g95-lam.conf

    r15d9412 r981f775  
    1616 
    1717[dougtest] 
    18 # directory where doug_main and doug_aggr are located 
     18# directory where doug_geom and doug_aggr are located 
    1919dougbindir: %(g-builddir)s/src/main 
    2020 

  • scripts/conf/kheiron/ifort-lam.conf

    r15d9412 r981f775  
    1616 
    1717[dougtest] 
    18 # directory where doug_main and doug_aggr are located 
     18# directory where doug_geom and doug_aggr are located 
    1919dougbindir: %(g-builddir)s/src/main 
    2020 

  • scripts/conf/kheiron/testscript.conf

    r15d9412 r981f775  
    1919levels=1 
    2020processors=1 
    21 executables=doug_main 
     21executables=doug_geom 
    2222 
    2323[testconf_basic] 
    … …  
    2626levels=1 
    2727processors=1,2 
    28 executables=doug_main,doug_aggr 
     28executables=doug_geom,doug_aggr 
    2929 
    3030[testconf_coarse] 

  • scripts/doug/execution.conf.tmpl

    r269c9be r981f775  
    22[DEFAULT] 
    33doug-datadir: . 
    4 #: directory where doug_main and doug_aggr are located 
     4#: directory where doug_geom and doug_aggr are located 
    55doug-bindir: /usr/bin 
    66#: directory where test is run 

  • scripts/testscript.py

    r82ee377 r981f775  
    6666#  overlaps=-1 
    6767#  smoothers=0,1 
    68 #  executables=doug_main,doug_aggr 
     68#  executables=doug_geom,doug_aggr 
    6969""" 
    7070 

  • src/main/geom.F90

    r72b1866 r981f775  
    2222!> Main program for running DOUG with input files in elemental form. 
    2323!> Running the code: (example) 
    24 !>   <tt>mpirun -np 3 doug_main -f doug.ctl</tt> 
     24!>   <tt>mpirun -np 3 doug_geom -f doug.ctl</tt> 
    2525!>     where \c doug.ctl may contain the following fields 
    2626!! 

  • tests/tests.conf

    raa02dfd r981f775  
    2121#  levels=1,2,3 
    2222#  processors=1,4 
    23 #  executables=doug_main,doug_aggr 
     23#  executables=doug_geom,doug_aggr 
    2424#  smoothers = 0,1,2 
    2525[tests] 
    … …  
    3838levels=1,2 
    3939#levels=1 
    40 executables=doug_main 
     40executables=doug_geom 
    4141smoothers = 0 
    4242overlaps = 0 

  • tests/tests_1lv.conf

    r82ee377 r981f775  
    2323#  levels=1,2,3 
    2424#  processors=1,4 
    25 #  executables=doug_main,doug_aggr 
     25#  executables=doug_geom,doug_aggr 
    2626#  smoothers = 0,1,2 
    2727[tests] 
    … …  
    4040levels=1 
    4141#levels=1 
    42 executables=%(g-dougdir)s/doug_main 
     42executables=%(g-dougdir)s/doug_geom 
    4343smoothers = 0 
    4444overlaps = -1,0,1,2 

  • tests/tests_all.conf

    raa02dfd r981f775  
    2222#  levels=1,2,3 
    2323#  processors=1,4 
    24 #  executables=doug_main,doug_aggr 
     24#  executables=doug_geom,doug_aggr 
    2525#  smoothers = 0,1,2 
    2626[tests] 
    … …  
    3939levels=1 
    4040#levels=1 
    41 executables=doug_main 
     41executables=doug_geom 
    4242smoothers = 0 
    4343overlaps = -1,0,1,2 
    … …  
    4848processors=1,2,4 
    4949levels=2 
    50 executables=doug_main 
     50executables=doug_geom 
    5151smoothers = 0,1,2 
    5252overlaps = -1,0 
    … …  
    8787processors=1,2 
    8888levels=1,2 
    89 executables=doug_main 
     89executables=doug_geom 
    9090smoothers = 0,1 
    9191overlaps = -1,1,2 

  • tests/tests_schwarz.conf

    r82ee377 r981f775  
    2323#  levels=1,2,3 
    2424#  processors=1,4 
    25 #  executables=doug_main,doug_aggr 
     25#  executables=doug_geom,doug_aggr 
    2626#  smoothers = 0,1,2 
    2727[tests] 
    … …  
    4040levels=1 
    4141#levels=1 
    42 executables=%(g-dougdir)s/doug_main 
     42executables=%(g-dougdir)s/doug_geom 
    4343smoothers = 0 
    4444overlaps = -1 
Note: See TracChangeset for help on using the changeset viewer.