Changeset dfed1c for src/commands


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

Location:
src/commands
Files:
5 added
28 edited

Legend:

Unmodified
Added
Removed

  • src/commands/com_check_consistency.cpp

    r66f24d rdfed1c  
    77 *
    88 */
    9 
    109
    1110#ifdef HAVE_CONFIG_H
    … …  
    2625  Request Run(Command::argument_vector arguments)
    2726  {
    28     Multigrid* grid = MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>();
     27    MPE_EVENT_BEGIN()
     28
     29    Multigrid* grid = MG::GetFactory().Get(arguments[0])->Cast<Multigrid>();
     30
     31    MPE_EVENT_END()
    2932
    3033    if (!(*grid)().IsConsistent())
    … …  
    3841};
    3942
    40 CREATE_INITIALIZER(VMGCommandCheckConsistency);
     43CREATE_INITIALIZER(VMGCommandCheckConsistency)

  • src/commands/com_check_iteration_counter.cpp

    r66f24d rdfed1c  
    2929  Request Run(Command::argument_vector arguments)
    3030  {
    31     const int& max_iteration = MG::GetFactory().GetObject("MAX_ITERATION")->Cast< ObjectStorage<int> >()->Val();
    32     int& iteration = MG::GetFactory().GetObject("ITERATION")->Cast< ObjectStorage<int> >()->Val();
     31    MPE_EVENT_BEGIN()
     32
     33    const int& max_iteration = MG::GetFactory().GetObjectStorageVal<int>("MAX_ITERATION");
     34    int& iteration = MG::GetFactory().GetObjectStorageVal<int>("ITERATION");
     35
     36    MPE_EVENT_END()
    3337
    3438    if (++iteration >= max_iteration)
    … …  
    4246};
    4347
    44 CREATE_INITIALIZER(VMGCommandCheckIterationCounter);
     48CREATE_INITIALIZER(VMGCommandCheckIterationCounter)

  • src/commands/com_check_relative_residual.cpp

    r66f24d rdfed1c  
    1414
    1515#include <cmath>
    16 #include <cstdio>
    1716
    1817#include "base/command.hpp"
    … …  
    3029  Request Run(Command::argument_vector arguments)
    3130  {
    32     VMG::Comm* comm = MG::GetComm();
     31    MPE_EVENT_BEGIN()
     32
    3333    VMG::Factory& factory = MG::GetFactory();
    3434
    35     const vmg_float res = comm->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs());
    36     const vmg_float& init_res = factory.GetObject(arguments[0])->Cast< ObjectStorage<vmg_float> >()->Val();
    37     const vmg_float& precision = factory.GetObject("PRECISION")->Cast< ObjectStorage<vmg_float> >()->Val();
    38     const vmg_float rel_res = fabs(res / init_res);
     35    const vmg_float& res = factory.GetObjectStorageVal<vmg_float>(arguments[0]);
     36    const vmg_float& init_res = factory.GetObjectStorageVal<vmg_float>(arguments[1]);
     37    const vmg_float& precision = factory.GetObjectStorageVal<vmg_float>("PRECISION");
     38    const vmg_float rel_res = std::fabs(res / init_res);
    3939
    40     if (comm->Rank() == 0)
    41       printf("Multigrid: Relative residual: %e\n", rel_res);
     40#ifdef DEBUG_OUTPUT
     41    MG::GetComm()->PrintStringOnce("Relative residual: %e", rel_res);
     42#endif /* DEBUG_OUTPUT */
     43
     44    MPE_EVENT_END()
    4245
    4346    if (rel_res < precision)
    … …  
    4851
    4952  static const char* Name() {return "CheckRelativeResidual";}
    50   static int Arguments() {return 1;}
     53  static int Arguments() {return 2;}
    5154};
    5255
    53 CREATE_INITIALIZER(VMGCommandCheckRelativeResidual);
     56CREATE_INITIALIZER(VMGCommandCheckRelativeResidual)
    5457

  • src/commands/com_check_residual.cpp

    r66f24d rdfed1c  
    1414
    1515#include <cmath>
    16 #include <cstdio>
    1716
    1817#include "base/command.hpp"
    … …  
    3029  Request Run(Command::argument_vector arguments)
    3130  {
    32     const vmg_float res = MG::GetComm()->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs());
    33     const vmg_float& precision = MG::GetFactory().GetObject("PRECISION")->Cast< ObjectStorage<vmg_float> >()->Val();
     31    MPE_EVENT_BEGIN()
    3432
    35 #ifdef DEBUG
    36     if (MG::GetComm()->Rank() == 0)
    37       printf("Multigrid: Residual: %e\n", res);
    38 #endif
     33    const vmg_float& res = MG::GetFactory().GetObjectStorageVal<vmg_float>(arguments[0]);
     34    const vmg_float& precision = MG::GetFactory().Get("PRECISION")->Cast< ObjectStorage<vmg_float> >()->Val();
    3935
    40     if (fabs(res) < precision)
     36    MPE_EVENT_END()
     37
     38    if (std::fabs(res) < precision)
    4139      return StopCycleLater;
    4240    else
    … …  
    4543
    4644  static const char* Name() {return "CheckResidual";}
    47   static int Arguments() {return 0;}
     45  static int Arguments() {return 1;}
    4846};
    4947
    50 CREATE_INITIALIZER(VMGCommandCheckResidual);
     48CREATE_INITIALIZER(VMGCommandCheckResidual)
    5149

  • src/commands/com_clear_coarse_levels.cpp

    r66f24d rdfed1c  
    2424  Request Run(Command::argument_vector arguments)
    2525  {
    26     MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>()->ClearAllCoarseLevels();
     26    MPE_EVENT_BEGIN()
     27
     28    MG::GetFactory().Get(arguments[0])->Cast<Multigrid>()->ClearAllCoarseLevels();
     29
     30    MPE_EVENT_END()
    2731
    2832    return Continue;
    … …  
    3337};
    3438
    35 CREATE_INITIALIZER(VMGCommandClearCoarseLevels);
     39CREATE_INITIALIZER(VMGCommandClearCoarseLevels)
    3640

  • src/commands/com_clear_grid.cpp

    r66f24d rdfed1c  
    2525  Request Run(Command::argument_vector arguments)
    2626  {
    27     MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>()->ClearAll();
     27    MPE_EVENT_BEGIN()
     28
     29    MG::GetFactory().Get(arguments[0])->Cast<Multigrid>()->ClearAll();
     30
     31    MPE_EVENT_END()
    2832
    2933    return Continue;
    … …  
    3438};
    3539
    36 CREATE_INITIALIZER(VMGCommandClearGrid);
     40CREATE_INITIALIZER(VMGCommandClearGrid)
    3741

  • src/commands/com_copy_boundary.cpp

    r66f24d rdfed1c  
    2323  Request Run(Command::argument_vector arguments)
    2424  {
    25     Grid& from = (*MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>())();
    26     Grid& to = (*MG::GetFactory().GetObject(arguments[1])->Cast<Multigrid>())();
     25    MPE_EVENT_BEGIN()
     26
     27    Grid& from = (*MG::GetFactory().Get(arguments[0])->Cast<Multigrid>())();
     28    Grid& to = (*MG::GetFactory().Get(arguments[1])->Cast<Multigrid>())();
    2729
    2830    to.SetBoundary(from);
     31
     32    MPE_EVENT_END()
    2933
    3034    return Continue;
    … …  
    3539};
    3640
    37 CREATE_INITIALIZER(VMGCommandCopyBoundary);
     41CREATE_INITIALIZER(VMGCommandCopyBoundary)
    3842

  • src/commands/com_execute_cycle.cpp

    r66f24d rdfed1c  
    2323  Request Run(Command::argument_vector arguments)
    2424  {
    25     return MG::GetFactory().GetObject(arguments[0])->Cast<CommandList>()->ExecuteList();
     25    MPE_EVENT_BEGIN()
     26
     27    Request req = MG::GetFactory().Get(arguments[0])->Cast<CommandList>()->ExecuteList();
     28
     29    MPE_EVENT_END()
     30
     31    return req;
    2632  }
    2733
    … …  
    3036};
    3137
    32 CREATE_INITIALIZER(VMGCommandExecuteCycle);
     38CREATE_INITIALIZER(VMGCommandExecuteCycle)

  • src/commands/com_execute_cycle_loop.cpp

    r66f24d rdfed1c  
    2323  Request Run(Command::argument_vector arguments)
    2424  {
    25     while (MG::GetFactory().GetObject(arguments[0])->Cast<CommandList>()->ExecuteList() == Continue);
     25    MPE_EVENT_BEGIN()
     26
     27    while (MG::GetFactory().Get(arguments[0])->Cast<CommandList>()->ExecuteList() == Continue);
     28
     29    MPE_EVENT_END()
    2630
    2731    return Continue;
    … …  
    3236};
    3337
    34 CREATE_INITIALIZER(VMGCommandExecuteCycleLoop);
     38CREATE_INITIALIZER(VMGCommandExecuteCycleLoop)

  • src/commands/com_execute_full_cycle.cpp

    r66f24d rdfed1c  
    2222  Request Run(Command::argument_vector arguments)
    2323  {
     24    MPE_EVENT_BEGIN()
     25
    2426    std::string str_init = arguments[0] + "_INIT";
    2527    std::string str_loop = arguments[0] + "_LOOP";
    … …  
    2830    VMG::Factory& factory = MG::GetFactory();
    2931
    30     factory.GetObject(str_init)->Cast<CommandList>()->ExecuteList();
    31     factory.GetObject(str_loop)->Cast<CommandList>()->ExecuteList();
    32     factory.GetObject(str_finalize)->Cast<CommandList>()->ExecuteList();
     32    factory.Get(str_init)->Cast<CommandList>()->ExecuteList();
     33    factory.Get(str_loop)->Cast<CommandList>()->ExecuteList();
     34    factory.Get(str_finalize)->Cast<CommandList>()->ExecuteList();
     35
     36    MPE_EVENT_END()
    3337
    3438    return Continue;
    … …  
    3943};
    4044
    41 CREATE_INITIALIZER(VMGCommandExecuteFullCycle);
     45CREATE_INITIALIZER(VMGCommandExecuteFullCycle)

  • src/commands/com_execute_full_cycle_loop.cpp

    r66f24d rdfed1c  
    2323  Request Run(Command::argument_vector arguments)
    2424  {
     25    MPE_EVENT_BEGIN()
     26
    2527    std::string str_init = arguments[0] + "_INIT";
    2628    std::string str_loop = arguments[0] + "_LOOP";
    2729    std::string str_finalize = arguments[0] + "_FINALIZE";
    2830
    29     MG::GetFactory().GetObject(str_init)->Cast<CommandList>()->ExecuteList();
     31    MG::GetFactory().Get(str_init)->Cast<CommandList>()->ExecuteList();
    3032
    31     while (MG::GetFactory().GetObject(str_loop)->Cast<CommandList>()->ExecuteList() == Continue);
     33    while (MG::GetFactory().Get(str_loop)->Cast<CommandList>()->ExecuteList() == Continue);
    3234
    33     MG::GetFactory().GetObject(str_finalize)->Cast<CommandList>()->ExecuteList();
     35    MG::GetFactory().Get(str_finalize)->Cast<CommandList>()->ExecuteList();
     36
     37    MPE_EVENT_END()
    3438
    3539    return Continue;
    … …  
    4044};
    4145
    42 CREATE_INITIALIZER(VMGCommandExecuteFullCycleLoop);
     46CREATE_INITIALIZER(VMGCommandExecuteFullCycleLoop)

  • src/commands/com_export_solution.cpp

    r66f24d rdfed1c  
    2525  Request Run(Command::argument_vector arguments)
    2626  {
     27    MPE_EVENT_BEGIN()
     28
    2729    Multigrid& sol = *MG::GetSol();
    2830
    2931    MG::GetInterface()->ExportSolution(sol(sol.MaxLevel()));
     32
     33    MPE_EVENT_END()
    3034
    3135    return Continue;
    … …  
    3640};
    3741
    38 CREATE_INITIALIZER(VMGCommandExportSolution);
     42CREATE_INITIALIZER(VMGCommandExportSolution)

  • src/commands/com_force_discrete_compatibility.cpp

    r66f24d rdfed1c  
    66 * @brief  May be used to explicitly force the discrete
    77 *         compatibility condition \sum_{i,j,k} f_{i,j,k} = 0.
    8  *         This should not be necessary since this is also
    9  *         handled in the library for arbitrary compatibility
    10  *         conditions.
     8 *
    119 */
    1210
    … …  
    2725  Request Run(Command::argument_vector arguments)
    2826  {
    29     (*MG::GetRhs())().ForceDiscreteCompatibilityCondition();
     27    MPE_EVENT_BEGIN()
     28
     29    Grid& rhs = (*MG::GetRhs())(MG::GetRhs()->MaxLevel());
     30    Comm& comm = *MG::GetComm();
     31
     32    if (comm.BoundaryConditions()[0] == Periodic &&
     33        comm.BoundaryConditions()[1] == Periodic &&
     34        comm.BoundaryConditions()[2] == Periodic)
     35      rhs.ForceDiscreteCompatibilityCondition();
     36
     37    MPE_EVENT_END()
    3038
    3139    return Continue;
    … …  
    3644};
    3745
    38 CREATE_INITIALIZER(VMGCommandForceDiscreteCompatibility);
     46CREATE_INITIALIZER(VMGCommandForceDiscreteCompatibility)

  • src/commands/com_import_rhs.cpp

    r66f24d rdfed1c  
    1414
    1515#include "base/command.hpp"
     16#include "comm/comm.hpp"
    1617#include "grid/multigrid.hpp"
    1718#include "interface/interface.hpp"
    … …  
    2526  Request Run(Command::argument_vector arguments)
    2627  {
     28    MPE_EVENT_BEGIN()
     29
    2730    MG::GetInterface()->ImportRightHandSide(*MG::GetRhs());
     31
     32    MPE_EVENT_END()
    2833
    2934    return Continue;
    … …  
    3439};
    3540
    36 CREATE_INITIALIZER(VMGCommandImportRightHandSide);
     41CREATE_INITIALIZER(VMGCommandImportRightHandSide)

  • src/commands/com_initialize_residual_norm.cpp

    r66f24d rdfed1c  
    1313#endif
    1414
    15 #include <cstdio>
    16 
    1715#include "base/command.hpp"
    1816#include "base/object.hpp"
    … …  
    2826  Request Run(Command::argument_vector arguments)
    2927  {
     28    MPE_EVENT_BEGIN()
     29
    3030    vmg_float residual = MG::GetComm()->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs());
    3131    new ObjectStorage<vmg_float>(arguments[0], residual);
    3232
    33     if (MG::GetComm()->Rank() == 0)
    34       printf("Multigrid: Initial residual: %e\n", residual);
     33#ifdef DEBUG_OUTPUT
     34    MG::GetComm()->PrintStringOnce("Initial residual: %e", residual);
     35#endif /* DEBUG_OUTPUT */
     36
     37    MPE_EVENT_END()
    3538
    3639    return Continue;
    … …  
    4144};
    4245
    43 CREATE_INITIALIZER(VMGCommandInitializeResidualNorm);
     46CREATE_INITIALIZER(VMGCommandInitializeResidualNorm)

  • src/commands/com_interpolate_fmg.cpp

    r66f24d rdfed1c  
    88 *
    99 */
    10 
    1110
    1211#ifdef HAVE_CONFIG_H
    … …  
    2625  Request Run(Command::argument_vector arguments)
    2726  {
    28     LevelOperator* lop = MG::GetFactory().GetObject("LEVELOPERATOR_FMG")->Cast<LevelOperator>();
     27    MPE_EVENT_BEGIN()
     28
     29    LevelOperator* lop = MG::GetFactory().Get("LEVELOPERATOR_FMG")->Cast<LevelOperator>();
    2930
    3031    lop->Prolongate(*MG::GetSol(), *MG::GetRhs());
     32
     33    MPE_EVENT_END()
    3134
    3235    return Continue;
    … …  
    3740};
    3841
    39 CREATE_INITIALIZER(VMGCommandInterpolateFMG);
     42CREATE_INITIALIZER(VMGCommandInterpolateFMG)

  • src/commands/com_print_defect.cpp

    r66f24d rdfed1c  
    88 *
    99 */
    10 
    1110
    1211#ifdef HAVE_CONFIG_H
    … …  
    2726  Request Run(Command::argument_vector arguments)
    2827  {
     28    MPE_EVENT_BEGIN()
     29
    2930    std::stringstream buffer;
    3031
    … …  
    3839    comm->PrintDefect(sol(), rhs(), buffer.str().c_str());
    3940
     41    MPE_EVENT_END()
     42
    4043    return Continue;
    4144  }
    … …  
    4548};
    4649
    47 CREATE_INITIALIZER(VMGCommandPrintDefect);
     50CREATE_INITIALIZER(VMGCommandPrintDefect)

  • src/commands/com_print_grid.cpp

    r66f24d rdfed1c  
    1 /*
    2  * command_print_grid.cpp
    3  *
    4  *  Created on: 16.03.2011
    5  *      Author: Julian Iseringhausen
    6  */
    7 
    81/**
    92 * @file   com_print_grid.cpp
    … …  
    169 *
    1710 */
    18 
    1911
    2012#ifdef HAVE_CONFIG_H
    … …  
    3628  Request Run(Command::argument_vector arguments)
    3729  {
     30    MPE_EVENT_BEGIN()
     31
    3832    std::ostringstream buffer;
    3933
    40     Multigrid& grid = *MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>();
     34    Multigrid& grid = *MG::GetFactory().Get(arguments[0])->Cast<Multigrid>();
    4135
    4236    buffer << "Level " << grid.Level() << " ";
     37
    4338    switch (grid().Global().BoundaryType())
    4439      {
    … …  
    5651        break;
    5752      }
     53
    5854    buffer << arguments[0];
    5955
    6056    MG::GetComm()->PrintGrid(grid(), buffer.str().c_str());
     57
     58    MPE_EVENT_END()
    6159
    6260    return Continue;
    … …  
    6765};
    6866
    69   CREATE_INITIALIZER(VMGCommandPrintGrid);
     67CREATE_INITIALIZER(VMGCommandPrintGrid)

  • src/commands/com_print_grid_structure.cpp

    r66f24d rdfed1c  
    1 
    21/**
    32 * @file   com_print_grid_structure.cpp
    … …  
    98 *
    109 */
    11 
    1210
    1311#ifdef HAVE_CONFIG_H
    … …  
    2725  Request Run(Command::argument_vector arguments)
    2826  {
     27    MPE_EVENT_BEGIN()
     28
    2929    MG::GetComm()->DebugPrintGridStructure((*MG::GetRhs()));
     30
     31    MPE_EVENT_END()
    3032
    3133    return Continue;
    … …  
    3638};
    3739
    38 CREATE_INITIALIZER(VMGCommandPrintGridStructure);
     40CREATE_INITIALIZER(VMGCommandPrintGridStructure)

  • src/commands/com_print_inner_grid.cpp

    r66f24d rdfed1c  
    2828  Request Run(Command::argument_vector arguments)
    2929  {
     30    MPE_EVENT_BEGIN()
     31
    3032    std::ostringstream buffer;
    31     Multigrid& grid = *MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>();
     33    Multigrid& grid = *MG::GetFactory().Get(arguments[0])->Cast<Multigrid>();
    3234
    3335    buffer << "Level " << grid.Level() << " " << arguments[0];
    3436
    3537    MG::GetComm()->PrintInnerGrid(grid(), buffer.str().c_str());
     38
     39    MPE_EVENT_END();
    3640
    3741    return Continue;
    … …  
    4246};
    4347
    44 CREATE_INITIALIZER(VMGCommandPrintInnerGrid);
     48CREATE_INITIALIZER(VMGCommandPrintInnerGrid)

  • src/commands/com_print_residual_norm.cpp

    r66f24d rdfed1c  
    1313#endif
    1414
    15 #include <cstdio>
     15#include <sstream>
    1616
    1717#include "base/command.hpp"
    1818#include "comm/comm.hpp"
     19#include "grid/grid.hpp"
    1920#include "grid/multigrid.hpp"
    2021#include "level/level_operator.hpp"
    … …  
    2829  Request Run(Command::argument_vector arguments)
    2930  {
    30     if (MG::GetComm()->Rank() == 0)
    31       printf("Multigrid: Residual: %e\n", MG::GetComm()->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs()));
     31    MPE_EVENT_BEGIN()
     32
     33    Multigrid* sol = MG::GetSol();
     34    Multigrid* rhs = MG::GetRhs();
     35    Comm* comm = MG::GetComm();
     36
     37    if ((*sol)(sol->MaxLevel()).IsActive()) {
     38      vmg_float residual = comm->ComputeResidualNorm(*sol, *rhs);
     39      comm->PrintStringOnce("Residual: %e", residual);
     40    }
     41
     42    MPE_EVENT_END()
    3243
    3344    return Continue;
    … …  
    3849};
    3950
    40 CREATE_INITIALIZER(VMGCommandPrintResidualNorm);
     51CREATE_INITIALIZER(VMGCommandPrintResidualNorm)

  • src/commands/com_prolongate.cpp

    r66f24d rdfed1c  
    2424  Request Run(Command::argument_vector arguments)
    2525  {
     26    MPE_EVENT_BEGIN()
     27
    2628    MG::GetLevelOperator()->Prolongate(*MG::GetSol(), *MG::GetRhs());
     29
     30    MPE_EVENT_END()
    2731
    2832    return Continue;
    … …  
    3337};
    3438
    35 CREATE_INITIALIZER(VMGCommandProlongate);
     39CREATE_INITIALIZER(VMGCommandProlongate)

  • src/commands/com_restrict.cpp

    r66f24d rdfed1c  
    2424  Request Run(Command::argument_vector arguments)
    2525  {
     26    MPE_EVENT_BEGIN()
     27
    2628    MG::GetLevelOperator()->Restrict(*MG::GetSol(), *MG::GetRhs());
     29
     30    MPE_EVENT_END()
    2731
    2832    return Continue;
    … …  
    3337};
    3438
    35 CREATE_INITIALIZER(VMGCommandRestrict);
     39CREATE_INITIALIZER(VMGCommandRestrict)

  • src/commands/com_set_average_to_zero.cpp

    r66f24d rdfed1c  
    2525  Request Run(Command::argument_vector arguments)
    2626  {
    27     (*MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>())().SetAverageToZero();
     27    MPE_EVENT_BEGIN()
     28
     29    (*MG::GetFactory().Get(arguments[0])->Cast<Multigrid>())().SetAverageToZero();
     30
     31    MPE_EVENT_END()
    2832
    2933    return Continue;
    … …  
    3438};
    3539
    36 CREATE_INITIALIZER(VMGCommandSetAverageToZero);
     40CREATE_INITIALIZER(VMGCommandSetAverageToZero)

  • src/commands/com_set_coarser_dirichlet_values.cpp

    r66f24d rdfed1c  
    2626  Request Run(Command::argument_vector arguments)
    2727  {
     28    MPE_EVENT_BEGIN()
     29
    2830    Multigrid& rhs = *MG::GetRhs();
    2931    Multigrid& sol = *MG::GetSol();
    … …  
    3436      sol(i).SetBoundary(rhs(i));
    3537
     38    MPE_EVENT_END()
     39
    3640    return Continue;
    3741  }
    … …  
    4145};
    4246
    43 CREATE_INITIALIZER(VMGCommandSetCoarserDirichletValues);
     47CREATE_INITIALIZER(VMGCommandSetCoarserDirichletValues)

  • src/commands/com_set_level.cpp

    r66f24d rdfed1c  
    99 *
    1010 */
    11 
    1211
    1312#ifdef HAVE_CONFIG_H
    … …  
    2726  Request Run(Command::argument_vector arguments)
    2827  {
    29     Multigrid* grid = MG::GetFactory().GetObject(arguments[0])->Cast<Multigrid>();
    30     ObjectStorage<int>* level = MG::GetFactory().GetObject(arguments[1])->Cast< ObjectStorage<int> >();
     28    MPE_EVENT_BEGIN()
     29
     30    Multigrid* grid = MG::GetFactory().Get(arguments[0])->Cast<Multigrid>();
     31    ObjectStorage<int>* level = MG::GetFactory().Get(arguments[1])->Cast< ObjectStorage<int> >();
    3132
    3233    grid->SetLevel(level->Val());
     34
     35    MPE_EVENT_END()
    3336
    3437    return Continue;
    … …  
    3942};
    4043
    41 CREATE_INITIALIZER(VMGCommandSetLevel);
     44CREATE_INITIALIZER(VMGCommandSetLevel)

  • src/commands/com_smooth.cpp

    r66f24d rdfed1c  
    2424  Request Run(Command::argument_vector arguments)
    2525  {
    26     const int& steps = MG::GetFactory().GetObject(arguments[0])->Cast< ObjectStorage<int> >()->Val();
     26    MPE_EVENT_BEGIN()
     27
     28    const int& steps = MG::GetFactory().Get(arguments[0])->Cast< ObjectStorage<int> >()->Val();
    2729
    2830    MG::GetSmoother()->Run(*MG::GetSol(), *MG::GetRhs(), steps);
     31
     32    MPE_EVENT_END()
    2933
    3034    return Continue;
    … …  
    3539};
    3640
    37 CREATE_INITIALIZER(VMGCommandSmooth);
     41CREATE_INITIALIZER(VMGCommandSmooth)

  • src/commands/com_solve.cpp

    r66f24d rdfed1c  
    2424  Request Run(Command::argument_vector arguments)
    2525  {
     26    MPE_EVENT_BEGIN()
     27
    2628    MG::GetSolver()->Run((*MG::GetSol())(), (*MG::GetRhs())());
     29
     30    MPE_EVENT_END()
    2731
    2832    return Continue;
    … …  
    3337};
    3438
    35 CREATE_INITIALIZER(VMGCommandSolve);
     39CREATE_INITIALIZER(VMGCommandSolve)
Note: See TracChangeset for help on using the changeset viewer.