Ignore:
Timestamp:
Nov 22, 2011, 9:22:10 PM (14 years ago)
Author:
Julian Iseringhausen <isering@…>
Children:
facba0
Parents:
66f24d
Message:

Major vmg update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1136 5161e1c8-67bf-11de-9fd5-51895aff932f

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/samples/techniques.hpp

    r66f24d rdfed1c  
    3232      init->AddCommand("ClearGrid", "SOL");
    3333      init->AddCommand("ImportRightHandSide");
     34      init->AddCommand("ForceDiscreteCompatibility");
    3435      init->AddCommand("CheckConsistency", "RHS");
    3536      init->AddCommand("CopyBoundary", "RHS:SOL");
     37      init->AddCommand("InitializeIterationCounter");
    3638      init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
    3739
    … …  
    4143      AddCycleGamma(*loop, maxLevel-minLevel+1, gamma);
    4244
    43       loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     45      loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     46      loop->AddCommand("CheckResidual", "RESIDUAL");
     47      loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    4448      loop->AddCommand("CheckIterationCounter");
    4549
    … …  
    6165    init->AddCommand("ClearGrid", "SOL");
    6266    init->AddCommand("ImportRightHandSide");
     67    init->AddCommand("ForceDiscreteCompatibility");
    6368    init->AddCommand("CheckConsistency", "RHS");
    6469    init->AddCommand("CopyBoundary", "RHS:SOL");
    65     init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     70    init->AddCommand("InitializeIterationCounter");
     71    init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     72    init->AddCommand("PrintAllSettings");
    6673
    6774    loop->AddCommand("ClearCoarseLevels", "RHS");
    … …  
    7077    AddCycleGammaDebug(*loop, maxLevel-minLevel+1, gamma);
    7178
    72     loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     79    loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     80    loop->AddCommand("CheckResidual", "RESIDUAL");
     81    loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    7382    loop->AddCommand("CheckIterationCounter");
    7483
    … …  
    8998    init->AddCommand("ClearGrid", "SOL");
    9099    init->AddCommand("ImportRightHandSide");
    91     init->AddCommand("CheckConsistency", "RHS");
     100    init->AddCommand("ForceDiscreteCompatibility");
     101    init->AddCommand("CheckConsistency", "RHS");
     102    init->AddCommand("InitializeIterationCounter");
    92103    init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
    93104
    … …  
    97108    AddCycleGamma(*loop, maxLevel-minLevel+1, gamma);
    98109
    99     loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     110    loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     111    loop->AddCommand("CheckResidual", "RESIDUAL");
     112    loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    100113    loop->AddCommand("CheckIterationCounter");
    101114
    … …  
    116129    init->AddCommand("ClearGrid", "SOL");
    117130    init->AddCommand("ImportRightHandSide");
    118     init->AddCommand("CheckConsistency", "RHS");
    119     init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     131    init->AddCommand("ForceDiscreteCompatibility");
     132    init->AddCommand("CheckConsistency", "RHS");
     133    init->AddCommand("InitializeIterationCounter");
     134    init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     135    init->AddCommand("PrintAllSettings");
    120136
    121137    loop->AddCommand("ClearCoarseLevels", "SOL");
    … …  
    124140    AddCycleGammaDebug(*loop, maxLevel-minLevel+1, gamma);
    125141
    126     loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     142    loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     143    loop->AddCommand("CheckResidual", "RESIDUAL");
     144    loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    127145    loop->AddCommand("CheckIterationCounter");
    128146
    … …  
    143161    init->AddCommand("ClearGrid", "SOL");
    144162    init->AddCommand("ImportRightHandSide");
     163    init->AddCommand("ForceDiscreteCompatibility");
    145164    init->AddCommand("CheckConsistency", "RHS");
    146165    init->AddCommand("CopyBoundary", "RHS:SOL");
     166    init->AddCommand("InitializeIterationCounter");
    147167    init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
    148168
    149169    AddCycleGamma(*loop, maxLevel-minLevel+1, gamma);
    150170
    151     loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     171    loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     172    loop->AddCommand("CheckResidual", "RESIDUAL");
     173    loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    152174    loop->AddCommand("CheckIterationCounter");
    153175
    … …  
    168190    init->AddCommand("ClearGrid", "SOL");
    169191    init->AddCommand("ImportRightHandSide");
     192    init->AddCommand("ForceDiscreteCompatibility");
    170193    init->AddCommand("CheckConsistency", "RHS");
    171194    init->AddCommand("CopyBoundary", "RHS:SOL");
    172     init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     195    init->AddCommand("InitializeIterationCounter");
     196    init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     197    init->AddCommand("PrintAllSettings");
    173198
    174199    AddCycleGammaDebug(*loop, maxLevel-minLevel+1, gamma);
    175200
    176     loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     201    loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     202    loop->AddCommand("CheckResidual", "RESIDUAL");
     203    loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    177204    loop->AddCommand("CheckIterationCounter");
    178205
    … …  
    193220    init->AddCommand("ClearGrid", "SOL");
    194221    init->AddCommand("ImportRightHandSide");
    195     init->AddCommand("CheckConsistency", "RHS");
     222    init->AddCommand("ForceDiscreteCompatibility");
     223    init->AddCommand("CheckConsistency", "RHS");
     224    init->AddCommand("InitializeIterationCounter");
    196225    init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
    197226
    198227    AddCycleGamma(*loop, maxLevel-minLevel+1, gamma);
    199228
    200     loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     229    loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     230    loop->AddCommand("CheckResidual", "RESIDUAL");
     231    loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    201232    loop->AddCommand("CheckIterationCounter");
    202233
    … …  
    217248    init->AddCommand("ClearGrid", "SOL");
    218249    init->AddCommand("ImportRightHandSide");
    219     init->AddCommand("CheckConsistency", "RHS");
    220     init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     250    init->AddCommand("ForceDiscreteCompatibility");
     251    init->AddCommand("CheckConsistency", "RHS");
     252    init->AddCommand("InitializeIterationCounter");
     253    init->AddCommand("InitializeResidualNorm", "INITIAL_RESIDUAL");
     254    init->AddCommand("PrintAllSettings");
    221255
    222256    AddCycleGammaDebug(*loop, maxLevel-minLevel+1, gamma);
    223257
    224     loop->AddCommand("CheckRelativeResidual", "INITIAL_RESIDUAL");
     258    loop->AddCommand("ComputeResidualNorm", "RESIDUAL");
     259    loop->AddCommand("CheckResidual", "RESIDUAL");
     260    loop->AddCommand("CheckRelativeResidual", "RESIDUAL:INITIAL_RESIDUAL");
    225261    loop->AddCommand("CheckIterationCounter");
    226262
    … …  
    295331    list.AddCommand("PrintGrid", "RHS");
    296332    list.AddCommand("Solve");
     333    list.AddCommand("PrintGrid", "SOL");
     334    list.AddCommand("PrintDefect");
    297335
    298336    for (int i=1; i<gamma; i++) {
Note: See TracChangeset for help on using the changeset viewer.